trivial diff: fix another bug in tools/test_mercury

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Nov 16 20:31:39 AEDT 1998


tools/test_mercury:
	Fix a bug in the code for automatically building binary distributions:
	on murlibobo, it was doing "version=`mmake version`" without having
	done "sh configure" beforehand.

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.85
diff -u -r1.85 test_mercury
--- test_mercury	1998/11/15 17:52:27	1.85
+++ test_mercury	1998/11/16 09:29:06
@@ -204,6 +204,8 @@
 mmake realclean MMAKEFLAGS=$PARALLEL || { false; exit 1; }
 ./configure --prefix=$INSTALL_DIR $CONFIG_OPTS || { false; exit 1; }
 mmake depend $PARALLEL || { false; exit 1; }
+version=`mmake version` || { false; exit 1; }
+fullarch=`mmake fullarch` || { false; exit 1; }
 tools/bootcheck -r -p -t $PARALLEL || $install_anyway || { false; exit 1; }
 cd .. || { false; exit 1; }
 
@@ -363,7 +365,6 @@
 	mercury_cv_bits_per_word=32 \
 	mercury_cv_unboxed_floats=no \
 	sh configure --prefix=$INSTALL_DIR &&
-	version=`mmake version` &&
 	mmake MMAKEFLAGS='EXTRA_MCFLAGS="-O5 --opt-space" -j6' tar &&
 	cd .. &&
 	rm -f mercury-latest-unstable/* &&
@@ -471,8 +472,6 @@
 
 {
 	cd $DIR/mercury &&
-	version=`mmake version` &&
-	fullarch=`mmake fullarch` &&
 	mmake bindist &&
 	cd .. &&
 	( [ -d $UNSTABLE ] || mkdir $UNSTABLE ) &&

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "Binaries may die
WWW: <http://www.cs.mu.oz.au/~fjh>  |   but source code lives forever"
PGP: finger fjh at 128.250.37.3        |     -- leaked Microsoft memo.



More information about the developers mailing list