[m-dev.] diff: add `-I../library' to ALL_C_INCL_DIRECTORIES

[Fergus Henderson]

On 13-May-2000, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> With this bug fix, the only manual intervention needed to bootstrap
> the MLDS back-end is setting LIBRARY_INTERMODULE=no.

Sorry, that statement was not correct.
The change below is also needed.
In addition, you also need to copy the stage2 runtime directory
but link the stage2 trace directory.

----------

Estimated hours taken: 0.25

browser/Mmakefile:
compiler/Mmakefile:
profiler/Mmakefile:
	Add `-I$(LIBRARY_DIR)' to ALL_C_INCL_DIRECTORIES, since this
	is needed for the MLDS back-end, which generates a C header file
	for each module in the library.

Workspace: /home/pgrad/fjh/ws/hg2
Index: browser/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/Mmakefile,v
retrieving revision 1.8
diff -u -d -r1.8 Mmakefile
--- browser/Mmakefile	2000/02/04 03:45:24	1.8
+++ browser/Mmakefile	2000/05/15 03:20:32
@@ -37,6 +37,7 @@
 M_ENV	=	MERCURY_INT_DIR=$(LIBRARY_DIR) \
 		MERCURY_ALL_C_INCL_DIRS="\
 			-I$(TRACE_DIR) \
+			-I$(LIBRARY_DIR) \
 			-I$(RUNTIME_DIR) \
 			-I$(BOEHM_GC_DIR) \
 			-I$(BOEHM_GC_DIR)/include \
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.25
diff -u -d -r1.25 Mmakefile
--- compiler/Mmakefile	2000/03/20 08:02:50	1.25
+++ compiler/Mmakefile	2000/05/15 03:20:48
@@ -22,6 +22,7 @@
 M_ENV	=	MERCURY_INT_DIR=$(LIBRARY_DIR) \
 		MERCURY_ALL_C_INCL_DIRS="\
 			-I$(TRACE_DIR) \
+			-I$(LIBRARY_DIR) \
 			-I$(RUNTIME_DIR) \
 			-I$(BOEHM_GC_DIR) \
 			-I$(BOEHM_GC_DIR)/include \
Index: profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/profiler/Mmakefile,v
retrieving revision 1.13
diff -u -d -r1.13 Mmakefile
--- profiler/Mmakefile	1999/09/16 04:46:27	1.13
+++ profiler/Mmakefile	2000/05/15 03:21:36
@@ -15,13 +15,14 @@
 
 #-----------------------------------------------------------------------------#
 
-# Specify which compilers to use to compile the compiler.
+# Specify which compilers to use to compile the profiler.
 # Don't change these without good reason - if you want to
 # do a temporary change, change ../Mmake.params
 
 M_ENV	=	MERCURY_INT_DIR=$(LIBRARY_DIR)  \
 		MERCURY_ALL_C_INCL_DIRS="\
 			-I$(TRACE_DIR) \
+			-I$(LIBRARY_DIR) \
 			-I$(RUNTIME_DIR) \
 			-I$(BOEHM_GC_DIR) \
 			-I$(BOEHM_GC_DIR)/include \

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