[m-rev.] diff: fix INSTALL_CVS problem

[Simon Taylor]

Estimated hours taken: 0.5
Branches: main, release

Mmake.common.in:
Mmakefile:
	Touch the top-level Mercury,options file if it doesn't
	exist in Mmake.common rather than Mmakefile, so that it
	is touched even if mmake is run in a subdirectory.

INSTALL_CVS:
	Touch Mercury.options before building to avoid a warning.

Index: INSTALL_CVS
===================================================================
RCS file: /home/mercury1/repository/mercury/INSTALL_CVS,v
retrieving revision 1.6
diff -u -u -r1.6 INSTALL_CVS
--- INSTALL_CVS	15 Jul 1998 05:23:20 -0000	1.6
+++ INSTALL_CVS	3 Mar 2003 14:21:01 -0000
@@ -42,6 +42,7 @@
 autoconf &&
 ./configure &&
 touch Mmake.params &&
+touch Mercury.options &&
 mmake depend $parallel &&
 mmake MMAKEFLAGS=$parallel &&
 tools/bootcheck $parallel &&
Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.70
diff -u -u -r1.70 Mmake.common.in
--- Mmake.common.in	1 Mar 2003 06:53:27 -0000	1.70
+++ Mmake.common.in	5 Mar 2003 02:08:47 -0000
@@ -218,6 +218,11 @@
 # can be found by `mmc --make'.
 include $(MERCURY_DIR)/Mercury.options
 
+$(MERCURY_DIR)/Mercury.options:
+	@if [ ! -f $(MERCURY_DIR)/Mercury.options ]; then \
+ 		touch $(MERCURY_DIR)/Mercury.options; \
+	fi
+
 # The Mmake.params file can be used to override definitions in this file
 -include $(MERCURY_DIR)/Mmake.params
 
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.98
diff -u -u -r1.98 Mmakefile
--- Mmakefile	1 Mar 2003 06:34:45 -0000	1.98
+++ Mmakefile	5 Mar 2003 03:13:40 -0000
@@ -254,11 +254,8 @@
 		exit 1; \
 	fi
 
-Mmake.common: Mercury.options Mmake.common.in config.status
+Mmake.common: Mmake.common.in config.status
 	./config.status
-
-Mercury.options:
-	touch Mercury.options
 
 README: .README.in VERSION
 	sed 's/@VERSION@/$(VERSION)/g' .README.in > README
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------