[m-rev.] diff: complete mmake support for grade specific .init files

[Julien Fischer]

Trace goals with compile time grade conditions and runtime environment
vars now work correctly with both mmake and mmc --make.  (I'll remove
the residual support for non-grade specific .init files next week.)

Estimated hours taken: 1
Branches: main

scripts/Mmake.vars.in:
 	Support user libraries and grade specific .init files with mmake.

Julien.

Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.105
diff -u -r1.105 Mmake.vars.in
--- scripts/Mmake.vars.in	23 Nov 2006 04:08:55 -0000	1.105
+++ scripts/Mmake.vars.in	30 Nov 2006 12:47:35 -0000
@@ -25,7 +25,7 @@
  EXTRA_C_INCL_DIRS	= \
  	$(patsubst %,%/lib/$(GRADESTRING)/inc,$(EXTRA_LIB_DIRS)) \
  	$(patsubst %,%/inc,$(EXTRA_LIB_DIRS))
-EXTRA_INIT_DIRS		= $(patsubst %,%/modules,$(EXTRA_LIB_DIRS))
+EXTRA_INIT_DIRS = $(patsubst %,%/modules/$(GRADESTRING),$(EXTRA_LIB_DIRS))
  MERCURY_EXTRA_INIT_DIRS = $(EXTRA_INIT_DIRS)
  else
  # mmc handles these itself when invoked with `--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
--------------------------------------------------------------------------