diff: Mmake.rules bug fix

[Fergus Henderson]

Estimated hours taken: 0.5

scripts/Mmake.rules:
        When invoking make recursively, pass $(MFLAGS) rather than
	$(MAKEOVERRIDES).  This avoids a warning, and is probably the
	right thing to do anyway (I'm not sure why I used MAKEOVERRIDES
	in the first place).  Previously I made exactly the same change
	in one place, but missed another occurrence of
	$(MAKEOVERRIDES).  This change fixes that other occurrence.

	Also when invoking make recursively, pass down the value of
	$(GRADEFLAGS).  Newer versions of GNU Make (e.g. 3.75) do
	this automatically, but older versions (e.g. 3.70) don't.
	This should fix a bug reported by Warwick Harvey where
	`mmake install_grades' at the top-level caused `.m' files in
	the library to be compiled with the wrong grades.

cvs diff  scripts/Mmake.rules
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.58
diff -u -r1.58 Mmake.rules
--- Mmake.rules	1998/04/02 13:23:06	1.58
+++ Mmake.rules	1998/05/26 09:47:06
@@ -167,12 +167,12 @@
 ifneq ($(RM_C),:)
 
 $(os_subdir)%.o : %.m
-	$(MMAKE_MAKE_CMD) $(MFLAGS) $(cs_subdir)$*.c
+	$(MMAKE_MAKE_CMD) $(MFLAGS) GRADEFLAGS="$(GRADEFLAGS)" $(cs_subdir)$*.c
 	$(MGNUC) $(GRADEFLAGS) $(MGNUCFLAGS) -c $(cs_subdir)$*.c -o $@
 	$(RM_C) $(cs_subdir)$*.c
 
 $(os_subdir)%.pic_o : %.m
-	$(MMAKE_MAKE_CMD) $(MAKEOVERRIDES) $(cs_subdir)$*.c
+	$(MMAKE_MAKE_CMD) $(MFLAGS) GRADEFLAGS="$(GRADEFLAGS)" $(cs_subdir)$*.c
 	$(MGNUC) $(GRADEFLAGS) $(MGNUCFLAGS) $(CFLAGS_FOR_PIC) \
 		-c $(cs_subdir)$*.c -o $@
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.