diff: fix more bindist bugs

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Dec 7 13:36:53 AEDT 1998


Estimated hours taken: 0.75

Fix some more bugs in the binary distribution.

bindist/Mmakefile:
bindist/bindist.Makefile.in:
	Fix bugs in the handling of the mdbrc and mdb_doc files.

Index: bindist/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/Mmakefile,v
retrieving revision 1.13
diff -u -r1.13 Mmakefile
--- Mmakefile	1998/11/24 00:26:06	1.13
+++ Mmakefile	1998/12/07 02:33:58
@@ -14,7 +14,8 @@
 
 INSTALL_LIB_DIR	= $(INSTALL_PREFIX)/lib
 
-LIB_FILES	= bin doc html inc ints lib modules $(NUPROLOG) $(SICSTUS)
+LIB_FILES	= bin doc html inc ints lib mdb/mdb_doc modules \
+		  $(NUPROLOG) $(SICSTUS)
 
 UTILS		= $(INSTALL_PREFIX)/bin/mkinit \
 		  $(INSTALL_PREFIX)/bin/mdemangle \
Index: bindist/bindist.Makefile.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.Makefile.in,v
retrieving revision 1.14
diff -u -r1.14 bindist.Makefile.in
--- bindist.Makefile.in	1998/12/02 18:11:13	1.14
+++ bindist.Makefile.in	1998/12/07 02:33:06
@@ -18,8 +18,7 @@
 INSTALL_SCRIPTS		= scripts/c2init scripts/mmc \
 			scripts/mercury_update_interface scripts/mgnuc \
 			scripts/ml scripts/mmake scripts/mprof \
-			scripts/mdb scripts/mkfifo_using_mknod \
-			scripts/mdbrc
+			scripts/mdb scripts/mkfifo_using_mknod
 
 SICSTUS_SCRIPTS		= scripts/msc scripts/msl \
 			scripts/msp scripts/sicstus_conv
@@ -28,7 +27,9 @@
 
 INSTALL_MMAKE_EXTRAS	= scripts/Mmake.rules scripts/Mmake.vars
 
-LIB_PARTS		= bin doc html inc ints lib mdb mmake modules
+INSTALL_MDB_EXTRAS	= scripts/mdbrc
+
+LIB_PARTS		= bin doc html inc ints lib mdb/mdb_doc modules
 LIB_NUPROLOG_PARTS	= @NUPROLOG@
 LIB_SICSTUS_PARTS	= @SICSTUS@
 
@@ -47,7 +48,7 @@
 
 .PHONY: install
 install: install_lib install_info install_man install_scripts install_mmake \
-		install_util $(INSTALL_SICSTUS) $(INSTALL_NUPROLOG)
+		install_mdb install_util $(INSTALL_SICSTUS) $(INSTALL_NUPROLOG)
 	@echo
 	@echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
 	@echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
@@ -113,6 +114,11 @@
 install_mmake: 
 	test -d $(INSTALL_LIBDIR)/mmake || mkdir -p $(INSTALL_LIBDIR)/mmake
 	cp $(INSTALL_MMAKE_EXTRAS) $(INSTALL_LIBDIR)/mmake
+
+.PHONY: install_mdb
+install_mdb: 
+	test -d $(INSTALL_LIBDIR)/mdb || mkdir -p $(INSTALL_LIBDIR)/mdb
+	cp $(INSTALL_MDB_EXTRAS) $(INSTALL_LIBDIR)/mdb
 
 .PHONY: install_util
 install_util: 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "Binaries may die
WWW: <http://www.cs.mu.oz.au/~fjh>  |   but source code lives forever"
PGP: finger fjh at 128.250.37.3        |     -- leaked Microsoft memo.



More information about the developers mailing list