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

@@ -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"