[m-rev.] diff: extras/trailed_update/samples/Mmakefile bug fix

[Fergus Henderson]

Estimated hours taken: 0.25
Branches: main

extras/trailed_update/samples/Mmakefile:
	Fix a bug where Mmake.params (which can set $(GRADE))
	was being included after a place that tests $(GRADE).

Workspace: /home/ceres/fjh/ws-ceres2/mercury
Index: extras/trailed_update/samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/samples/Mmakefile,v
retrieving revision 1.15
diff -u -d -r1.15 Mmakefile
--- extras/trailed_update/samples/Mmakefile	7 Nov 2002 06:06:44 -0000	1.15
+++ extras/trailed_update/samples/Mmakefile	10 Nov 2002 23:57:23 -0000
@@ -29,6 +29,13 @@
 
 MLFLAGS += --static
 
+DIFF_OPTS=-c
+
+#-----------------------------------------------------------------------------#
+
+# The Mmake.params file can be used to override definitions in this file
+-include ../../Mmake.params
+
 #-----------------------------------------------------------------------------#
 
 # The "vqueens" program does not work in ".rt" grades,
@@ -42,7 +49,6 @@
 PROGS	=	interpreter vqueens
 endif
 
-
 DEPENDS =	$(PROGS:%=%.depend)
 CS	=	$(PROGS:%=%.c)
 RESS	=	$(PROGS:%=%.res)
@@ -54,8 +60,6 @@
 %.out: %
 	./$< > $@ 2>&1;
 
-DIFF_OPTS=-c
-
 %.res: %.exp %.out
 	diff $(DIFF_OPTS) $*.exp $*.out > $@
 
@@ -81,10 +85,5 @@
 .PHONY: clean_local
 clean_local:
 	rm -f *.out *.res
-
-#-----------------------------------------------------------------------------#
-
-# The Mmake.params file can be used to override definitions in this file
--include ../../Mmake.params
 
 #-----------------------------------------------------------------------------#

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------