[Unison-hackers] [unison-svn] r553 - trunk/src

bcpierce at seas.upenn.edu bcpierce at seas.upenn.edu
Wed Jan 27 11:29:50 EST 2016


Author: bcpierce
Date: 2016-01-27 11:29:50 -0500 (Wed, 27 Jan 2016)
New Revision: 553

Modified:
   trunk/src/Makefile
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
Log:
* Make the installation Makefile a bit more paranoid, to prevent bad
  behavior if the OCaml installation is not present or messed up

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2015-12-08 14:10:15 UTC (rev 552)
+++ trunk/src/Makefile	2016-01-27 16:29:50 UTC (rev 553)
@@ -90,6 +90,10 @@
 	$(MAKE) -C .. text
 
 doinstall: $(NAME)$(EXEC_EXT)
+	if [ ! $(NAME) ]; then \
+	    echo "makefile variable NAME not bound"; \
+	    exit 1 \
+          ; fi 
 	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2015-12-08 14:10:15 UTC (rev 552)
+++ trunk/src/RECENTNEWS	2016-01-27 16:29:50 UTC (rev 553)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.49.9
+
+* Make the installation Makefile a bit more paranoid, to prevent bad
+  behavior if the OCaml installation is not present or messed up
+-------------------------------
 CHANGES FROM VERSION 2.49.8
 
 * Update copyright dates to 2016

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2015-12-08 14:10:15 UTC (rev 552)
+++ trunk/src/mkProjectInfo.ml	2016-01-27 16:29:50 UTC (rev 553)
@@ -110,3 +110,4 @@
 
 
 
+



More information about the Unison-hackers mailing list