[m-dev.] diff: fix bug with `cd extras/dynamic_linking && $(SUBDIR_MMAKE) sources'
Fergus Henderson
fjh at cs.mu.OZ.AU
Sat Jan 13 16:30:13 AEDT 2001
Estimated hours taken: 0.25
compiler/Mmakefile:
Fix a bug in my recent change to build the sources in
extras/dynamic_linking: we can't use $(SUBDIR_MMAKE), since
that uses `../scripts', whereas for the extras/dynamic_linking
directory, we need `../../scripts'. Instead define a new
variable SUBSUBDIR_MMAKE, and use that.
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.64
diff -u -d -u -u -5 -r1.64 Mmakefile
--- Mmakefile 2001/01/11 06:23:10 1.64
+++ Mmakefile 2001/01/13 05:26:56
@@ -39,10 +39,15 @@
SUBDIR_MMAKE = PATH=../scripts:../util:$$PATH \
MMAKE_VPATH=. \
MMAKE_DIR=../scripts \
../scripts/mmake $(MMAKEFLAGS)
+SUBSUBDIR_MMAKE = PATH=../../scripts:../../util:$$PATH \
+ MMAKE_VPATH=. \
+ MMAKE_DIR=../../scripts \
+ ../../scripts/mmake $(MMAKEFLAGS)
+
#-----------------------------------------------------------------------------#
# `mmake dep' ensures that the .dep files exist;
# `mmake depend' forces them to be remade to ensure that they are up-to-date.
@@ -215,11 +220,11 @@
cd profiler && $(SUBDIR_MMAKE) cs tags
cd doc && $(SUBDIR_MMAKE) info html dvi mdb_doc
cd bindist && $(SUBDIR_MMAKE) bindist.configure
# the following command might fail on Windows?
-cd bindist && $(SUBDIR_MMAKE) bindist.build_vars
- cd extras/dynamic_linking && $(SUBDIR_MMAKE) sources
+ cd extras/dynamic_linking && $(SUBSUBDIR_MMAKE) sources
# clean up
cd scripts && mmake realclean
cd scripts && mmake canonical_grade
cd util && mmake realclean
cd doc && mmake distclean
--
Fergus Henderson <fjh at cs.mu.oz.au> | "I have always known that the pursuit
| of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh> | -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to: mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions: mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
More information about the developers
mailing list