[m-rev.] trivial diff: fix bug with ERR_REDIRECT

[Fergus Henderson]

Branches: main
Estimated hours taken: 0.25

scripts/Mmake.rules:
scripts/Mmake.vars.in:
	Define ERR_REDIRECT in Mmake.vars.in, rather than Mmake.rules,
	so that it can be overridden by the user's Mmakefile.

Workspace: /home/earth/fjh/ws-earth3/mercury
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.133
diff -u -d -r1.133 Mmake.rules
--- scripts/Mmake.rules	13 Sep 2002 18:51:40 -0000	1.133
+++ scripts/Mmake.rules	15 Sep 2002 09:59:22 -0000
@@ -191,15 +191,6 @@
 $(pic_ss_subdir)%.pic_s : $(pic_s_dates_subdir)%.pic_s_date
 	@:
 
-# This variable contains the shell syntax to redirect the output of
-# a compilation command to a file.  Normally the file chosen is *.err.
-# However, you can override this variable to modify that behaviour.
-# Setting this variable to the empty string will cause all errors to
-# go to stdout/stderr.
-# Setting this variable to ">> allerrs 2>&1" will cause errors
-# to be accumulated into a single file.
-ERR_REDIRECT = > $(*F).err 2>&1
-
 $(s_dates_subdir)%.s_date : %.m
 	$(MCG) $(ALL_GRADEFLAGS) --target-code-only $(ALL_MCGFLAGS) \
 		$(*F) $(ERR_REDIRECT)
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.79
diff -u -d -r1.79 Mmake.vars.in
--- scripts/Mmake.vars.in	22 Aug 2002 02:34:21 -0000	1.79
+++ scripts/Mmake.vars.in	15 Sep 2002 10:00:22 -0000
@@ -721,3 +721,14 @@
 A=@LIB_SUFFIX@
 
 #-----------------------------------------------------------------------------#
+
+# This variable contains the shell syntax to redirect the output of
+# a compilation command to a file.  Normally the file chosen is *.err.
+# However, you can override this variable to modify that behaviour.
+# Setting this variable to the empty string will cause all errors to
+# go to stdout/stderr.
+# Setting this variable to ">> allerrs 2>&1" will cause errors
+# to be accumulated into a single file.
+ERR_REDIRECT = > $(*F).err 2>&1
+
+#-----------------------------------------------------------------------------#

-- 
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
--------------------------------------------------------------------------