[m-rev.] diff: fix a problem with mmake --use-mmc-make and GNU make 3.82

[Julien Fischer]

Branches: main, 10.04

Apply a patch from Keri Harris that fixes a problem with mmake --use-mmc-make
when using GNU make 3.82.  The problem was that we were mixing normal and
implicit rules and GNU make no longer supports this (and officially never
did).

scripts/Mmake.rules:
 	Don't mix normal and implicit rules.

Julien.

Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.157
diff -u -r1.157 Mmake.rules
--- scripts/Mmake.rules	30 Sep 2010 07:23:34 -0000	1.157
+++ scripts/Mmake.rules	8 Nov 2010 07:16:27 -0000
@@ -399,7 +399,10 @@

  # Always attempt to rebuild these files, even if they exist.
  .PHONY: $(ALL_MC_BUILD_FILES) *.err
-$(ALL_MC_BUILD_FILES) %.err:
+$(ALL_MC_BUILD_FILES):
+	$(MCM) $@
+
+%.err:
  	$(MCM) $@

  # If we don't know how to make the file, try using `mmc --make'.
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------