[m-rev.] fixes for building extras

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main, release

Various changes to make it easier to build the extras.

extras/dynamic_linking/Mmakefile:
	Don't require the existence of "../../../mercury/browser".

extras/posix/README:
	Mention that it may be necessary to set MLLIBS.

extras/references/Mmakefile:
	Don't include the "asm_fast.tr" grade in LIBGRADES, since by
	default the Mercury standard library doesn't get installed in
	that grade.

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: extras/dynamic_linking/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/dynamic_linking/Mmakefile,v
retrieving revision 1.8
diff -u -d -r1.8 Mmakefile
--- extras/dynamic_linking/Mmakefile	16 Jan 2003 10:44:16 -0000	1.8
+++ extras/dynamic_linking/Mmakefile	16 Feb 2004 23:36:29 -0000
@@ -61,14 +61,20 @@
 BROWSER_DIR = $(shell \
 	if [ -d ../../browser ]; then \
 		echo ../../browser; \
-	else \
+	elif [ -d ../../../mercury/browser ]; then \
 		echo ../../../mercury/browser; \
+	else \
+		echo none; \
 	fi)
 
+ifneq ("$(BROWSER_DIR)","none")
+
 name_mangle.m: $(BROWSER_DIR)/name_mangle.m
 	sed 's/mdb__//g' $< > $@
 
 dl.m: $(BROWSER_DIR)/dl.m
 	sed 's/mdb__//g' $< > $@
+
+endif
 
 #-----------------------------------------------------------------------------#
Index: extras/posix/README
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/posix/README,v
retrieving revision 1.1
diff -u -d -r1.1 README
--- extras/posix/README	12 Oct 1999 00:12:20 -0000	1.1
+++ extras/posix/README	16 Feb 2004 23:49:47 -0000
@@ -2,3 +2,10 @@
 Mercury. Since I don't actually have a copy of the standard, it's more
 like the stuff that man pages claim is in POSIX.3, and not even all of
 that. :-) conway, 12/10/99
+
+Note that on some systems, it may be necessary to link with additional
+libraries.  This can be done by setting the variable MLLIBS in the Mmakefile,
+e.g.
+
+	MLLIBS = -lsocket -lnsl
+
Index: extras/references/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/references/Mmakefile,v
retrieving revision 1.5
diff -u -d -r1.5 Mmakefile
--- extras/references/Mmakefile	16 Jan 2003 10:44:26 -0000	1.5
+++ extras/references/Mmakefile	16 Feb 2004 23:45:46 -0000
@@ -10,7 +10,7 @@
 
 # Install in an "extras" subdirectory of the main installation tree
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
-LIBGRADES = asm_fast.gc.tr asm_fast.tr asm_fast.gc.tr.debug
+LIBGRADES = asm_fast.gc.tr asm_fast.gc.tr.debug
 
 MAIN_TARGET = libglobal
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------