From a8384f6bb91dd5267b87c3408533dc448c2b2bee Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 15 Oct 2015 20:25:30 +0000 Subject: [PATCH] Top level Makefile change: examples-distr merges into rather than replaces examples, if present. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10768 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 347c690c..715cc552 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,9 @@ do_build: @if [ -e prism/tests ]; then \ echo "mv prism/tests dontcopy"; mv prism/tests dontcopy; \ fi + echo "mv prism-examples prism/examples"; mv prism-examples prism/examples @if [ -e prism/examples-distr ]; then \ - echo "mv prism/examples-distr prism/examples"; mv prism/examples-distr prism/examples; \ - else \ - echo "mv prism-examples prism/examples"; mv prism-examples prism/examples; \ + echo "mv prism/examples-distr/* prism/examples"; mv prism/examples-distr/* prism/examples; \ fi mv cudd prism mv prism "prism-$(VERSION)-src"