trivial diff: fix pointers between places that know library names

Zoltan Somogyi zs at cs.mu.OZ.AU
Thu Oct 1 17:04:14 AEST 1998


Estimated hours taken: 0.2

Mmake.common.in:
scripts/ml.in:
tools/bootcheck:
	Update the comments about the other locations that know the names of
	the libraries, now that c2init knows them too.

scripts/c2init.in:
	Add a comment about the other locations.

Zoltan.

Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.29
diff -u -u -r1.29 Mmake.common.in
--- Mmake.common.in	1998/09/29 05:09:55	1.29
+++ Mmake.common.in	1998/10/01 06:58:23
@@ -176,8 +176,8 @@
 # have just a ".init" suffix. (The trace library does not have a .init file,
 # since it contains no Mercury code.)
 #
-# If you change these, you will also need to change script/ml.in
-# and tools/bootcheck.
+# If you change these, you will also need to change scripts/ml.in,
+# scripts/c2init.in and and tools/bootcheck.
 RT_LIB_NAME = mer_rt
 STD_LIB_NAME = mer_std
 TRACE_LIB_NAME = mer_trace
Index: scripts/ml.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/ml.in,v
retrieving revision 1.47
diff -u -u -r1.47 ml.in
--- ml.in	1998/09/29 05:11:33	1.47
+++ ml.in	1998/10/01 06:56:30
@@ -85,8 +85,8 @@
 SHLIB_RPATH_SEP=${MERCURY_SHLIB_RPATH_SEP="@SHLIB_RPATH_SEP@"}
 SHARED_LIBS=${MERCURY_SHARED_LIBS="@SHARED_LIBS@"}
 
-# If you change these, you will also need to change Mmake.common.in
-# and tools/bootcheck.
+# If you change these, you will also need to change Mmake.common.in,
+# scripts/c2init.in and tools/bootcheck.
 RT_LIB_NAME=mer_rt
 STD_LIB_NAME=mer_std
 TRACE_LIB_NAME=mer_trace
Index: scripts/c2init.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/c2init.in,v
retrieving revision 1.18
diff -u -u -r1.18 c2init.in
--- c2init.in	1998/10/01 04:19:49	1.18
+++ c2init.in	1998/10/01 06:57:43
@@ -52,11 +52,18 @@
 	MERCURY_MOD_LIB_DIR, MERCURY_MOD_LIB_MODS, MERCURY_MKINIT.
 "
 
+# If you change these, you will also need to change Mmake.common.in,
+# scripts/ml.in and tools/bootcheck.
+RT_LIB_NAME=mer_rt
+STD_LIB_NAME=mer_std
+TRACE_LIB_NAME=mer_trace
+BROWSER_LIB_NAME=mer_browser
+
 MERCURY_MOD_LIB_DIR=${MERCURY_MOD_LIB_DIR=@LIBDIR@/modules}
 MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS="\
-				$MERCURY_MOD_LIB_DIR/mer_rt.init \
-				$MERCURY_MOD_LIB_DIR/mer_std.init \
-				$MERCURY_MOD_LIB_DIR/mer_browser.init \
+				$MERCURY_MOD_LIB_DIR/$RT_LIB_NAME.init \
+				$MERCURY_MOD_LIB_DIR/$STD_LIB_NAME.init \
+				$MERCURY_MOD_LIB_DIR/$BROWSER_LIB_NAME.init \
 			"}
 MKINIT=${MERCURY_MKINIT=mkinit}
 
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.64
diff -u -u -r1.64 bootcheck
--- bootcheck	1998/09/29 05:11:44	1.64
+++ bootcheck	1998/10/01 06:58:14
@@ -74,8 +74,8 @@
 test_sicstus=false
 use_subdirs=${MMAKE_USE_SUBDIRS=no}
 
-# If you change these, you will also need to change script/ml.in
-# and Mmake.common.in.
+# If you change these, you will also need to change scripts/ml.in,
+# scripts/c2init.in and Mmake.common.in.
 RT_LIB_NAME=mer_rt
 STD_LIB_NAME=mer_std
 TRACE_LIB_NAME=mer_trace



More information about the developers mailing list