[m-rev.] diff: fix binary packages on linux

[Julien Fischer]

Estimated hours taken: 1
Branches: main, release

Fix the scripts that build and install the binary packages for Linux.  These
have been broken since the change that moved the executables, mercury_compile,
mercury_profile etc, into $(INSTALL_PREFIX)/bin.

bindist/Mmakefile:
	Tar up the bin directory of the installation we are building
	the binary package from since it now contains the executables.

	Conform to the current structure of the library installation
	hierarchy.

bindist/bindist.Mmakefile.in:
	Conform to the above changes when installing.

Julien.

Index: bindist/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/Mmakefile,v
retrieving revision 1.40
diff -u -r1.40 Mmakefile
--- bindist/Mmakefile	25 Oct 2005 10:17:26 -0000	1.40
+++ bindist/Mmakefile	26 Apr 2006 05:31:39 -0000
@@ -17,7 +17,7 @@

 INSTALL_LIB_DIR	= $(INSTALL_PREFIX)/lib

-LIB_FILES	= bin conf doc html inc ints lib mdb/mdb_doc modules reconf
+LIB_FILES	= conf doc html inc ints lib mdb/mdb_doc modules reconf

 # Miscellaneous scripts and utilities not processed by configure
 UTILS		= $(INSTALL_PREFIX)/bin/mkinit$(EXT_FOR_EXE) \
@@ -78,6 +78,11 @@
 	# tar it up
 	# (XXX don't use redirection or pipes, because on gnu-win32
 	# stdout defaults to text mode, which breaks tar and gzip)
+	# NOTE: we tar up all of the existing bin directory even though
+	# most of it will be replaced when the installation is reconfigured.
+	(dir=`pwd` && cd $(INSTALL_BINDIR)/.. && \
+		tar -cf $$dir/$(MERCURY_VERSION)/bin.tar bin && \
+		gzip $$dir/$(MERCURY_VERSION)/bin.tar)
 	(dir=`pwd` && cd $(INSTALL_LIB_DIR)/mercury && \
 		tar -cf $$dir/$(MERCURY_VERSION)/lib.tar $(LIB_FILES) && \
 		gzip $$dir/$(MERCURY_VERSION)/lib.tar)
Index: bindist/bindist.Makefile.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.Makefile.in,v
retrieving revision 1.33
diff -u -r1.33 bindist.Makefile.in
--- bindist/bindist.Makefile.in	25 Oct 2005 10:17:26 -0000	1.33
+++ bindist/bindist.Makefile.in	26 Apr 2006 05:36:26 -0000
@@ -32,7 +32,7 @@

 INSTALL_MDB_EXTRAS	= scripts/mdbrc

-LIB_PARTS	= bin conf doc html inc ints lib mdb/mdb_doc modules reconf
+LIB_PARTS	= conf doc html inc ints lib mdb/mdb_doc modules reconf

 EXT_FOR_EXE		= @EXT_FOR_EXE@

@@ -61,7 +61,7 @@
 # with minor changes.

 .PHONY: install
-install: install_lib install_info install_man \
+install: install_bin install_lib install_info install_man \
 		install_scripts install_emacs_scripts \
 		install_mmake install_mdb install_util
 	@echo
@@ -74,6 +74,14 @@
 	@echo "		\"$(INSTALL_ELISP_DIR)\") load-path))"
 	@echo "	(autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"

+.PHONY: install_bin
+install_bin:
+	@echo "-- Installing bin in $(INSTALL_BINDIR)..."
+	test -d $(INSTALL_BINDIR) || mkdir -p $(INSTALL_BINDIR)
+	gzip --decompress --stdout bin.tar.gz | ( \
+		cd $(INSTALL_BINDIR)/.. && tar -xf - )
+	@echo "-- Done."
+
 .PHONY: install_lib
 install_lib:
 	@echo "-- Installing lib in $(INSTALL_LIBDIR)..."

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