[m-rev.] diff: fix library installation on our machines

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

Ensure that Mercury.config and Mmake.vars contain the correct set of
installed library grades on our machines.

tools/test_mercury:
 	Write out the set of grades in which the libraries are to be
 	installed to .enable_lib_grades rather than including a LIBGRADES =
 	line in Mmake.params.  The problem with the later is that while
 	that setting overrides the default set of libgrades during an
 	installation it doesn't override the default set of libgrades
 	chosen by the configure script and written out to the Mercury.config
 	and Mmake.vars files.  This means on many of our hosts that doing
 	mmc --make libfoo.install will fail because the set of library
 	grades that are actually different from the ones that Mercury's
 	configuration files say should be installed.

Julien.

Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.323
diff -u -r1.323 test_mercury
--- test_mercury	22 Aug 2007 14:30:48 -0000	1.323
+++ test_mercury	16 Oct 2007 11:16:00 -0000
@@ -645,11 +645,6 @@
  		*)	echo "GRADE = $INSTALL_GRADE" >> Mmake.params
  			;;
  	esac
-	case "$INSTALL_LIBGRADES" in
-		"")	;;
-		*)	echo "LIBGRADES = $INSTALL_LIBGRADES" >> Mmake.params
-			;;
-	esac
  # fi

  # We allow "asm" as a special value for the C_COMPILER
@@ -669,7 +664,12 @@
  export CC

  MMAKE="mmake $USE_MMC_MAKE"
-
+ 
+if test "$INSTALL_LIBGRADES" != ""
+then
+	echo "$INSTALL_LIBGRADES" > .enable_lib_grades
+fi
+
  autoconf || { false; exit 1; }
  rm -f config.cache
  ./configure --prefix=$INSTALL_DIR $CONFIG_OPTS || { false; exit 1; }

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------