[m-rev.] (For review) Minor change to bindist build

[Ralph Becket]

Can someone who knows the build system check that this is correct?


Estimated hours taken: 3
Branches: main

Minor corrections to the bindist build.

bindist/Mmakefile:
	Revised a comment concerning the Aditi release.
	Ensure that the configure file is executable.

bindist/bindist.configure.in:
	Fixed a typo that was causing problems with the
	binary installation.

Index: bindist/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/Mmakefile,v
retrieving revision 1.33
diff -u -r1.33 Mmakefile
--- bindist/Mmakefile	1 Nov 2002 07:10:16 -0000	1.33
+++ bindist/Mmakefile	4 Nov 2002 05:41:07 -0000
@@ -105,7 +105,7 @@
 	(dir=`pwd` && cd .. && \
 		tar -cf $$dir/$(MERCURY_VERSION)/extras.tar extras && \
 		gzip $$dir/$(MERCURY_VERSION)/extras.tar)
-	# Aditi isn't ready for distribution yet.
+	# This code is provided in the Aditi distribution.
 	rm -rf $(MERCURY_VERSION)/extras/aditi
 	if [ -d ../tests ]; then					\
 		(dir=`pwd` && cd .. && \
@@ -121,6 +121,8 @@
 			-e 's/<FULLARCH>/$(FULLARCH)/g'			\
 			bindist.$$file > $(MERCURY_VERSION)/$$file || exit 1; \
 	done
+	# Ensure the configure file is executable.
+	chmod +x $(MERCURY_VERSION)/configure
 	# (XXX don't use redirection or pipes, because on gnu-win32
 	# stdout defaults to text mode, which breaks tar and gzip)
 	tar -cf ../$(MERCURY_VERSION).tar $(MERCURY_VERSION)
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.configure.in,v
retrieving revision 1.43
diff -u -r1.43 bindist.configure.in
--- bindist/bindist.configure.in	25 Oct 2002 02:29:57 -0000	1.43
+++ bindist/bindist.configure.in	4 Nov 2002 05:37:15 -0000
@@ -205,7 +205,7 @@
 #-----------------------------------------------------------------------------#
 AC_PROG_CC
 MERCURY_CHECK_CC_NEEDS_TRAD_CPP
-MERCURY_CHECK_LOCAL_INCL_DIRS
+MERCURY_CHECK_LOCAL_C_INCL_DIRS
 AC_SUBST(CC)
 #-----------------------------------------------------------------------------#
 # Microsoft.NET configuration (the bindist may be installed on a machine
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------