diff: fix bindist bugs
Fergus Henderson
fjh at cs.mu.OZ.AU
Tue Nov 24 11:08:22 AEDT 1998
Estimated hours taken: 0.5
Fix some bugs in the binary distribution.
bindist/bindist.configure.in:
Copy some code that was added to ../configure.in:
- Check for `mktemp'
- Substitute DEFAULT_MERCURY_DEBUGGER_INIT_DIR.
bindist/Mmakefile:
Include `mprof_merge_runs' in the list of utility programs.
Don't include `mdb' in the list of script files, since that list
already includes `mdb.in', which is the file we want.
bindist/bindist.Makefile.in:
Add `mdbrc' to the list of script files to install.
Index: bindist/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/Mmakefile,v
retrieving revision 1.12
diff -u -r1.12 Mmakefile
--- Mmakefile 1998/11/08 22:41:55 1.12
+++ Mmakefile 1998/11/23 23:35:26
@@ -18,13 +18,14 @@
UTILS = $(INSTALL_PREFIX)/bin/mkinit \
$(INSTALL_PREFIX)/bin/mdemangle \
- $(INSTALL_PREFIX)/bin/mtags
+ $(INSTALL_PREFIX)/bin/mtags \
+ $(INSTALL_PREFIX)/bin/mprof_merge_runs
README_ETC = ../COPYING ../COPYING.LIB ../HISTORY ../LIMITATIONS \
../NEWS ../RELEASE_NOTES ../BUGS ../WORK_IN_PROGRESS \
../VERSION
-SCRIPT_FILES = ../scripts/*.in ../scripts/mdb ../scripts/*.sh-subr \
+SCRIPT_FILES = ../scripts/*.in ../scripts/*.sh-subr \
../scripts/Mmake.rules
CONFIG_FILES = ../config.sub ../config.guess ../install-sh
Index: bindist/bindist.Makefile.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 bindist.Makefile.in
--- bindist.Makefile.in 1998/10/06 05:36:07 1.11
+++ bindist.Makefile.in 1998/11/23 23:18:07
@@ -18,7 +18,8 @@
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/mdb scripts/mkfifo_using_mknod \
+ scripts/mdbrc
SICSTUS_SCRIPTS = scripts/msc scripts/msl \
scripts/msp scripts/sicstus_conv
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.configure.in,v
retrieving revision 1.16
diff -u -r1.16 bindist.configure.in
--- bindist.configure.in 1998/11/20 18:27:31 1.16
+++ bindist.configure.in 1998/11/23 23:49:56
@@ -17,6 +17,9 @@
AC_SUBST(PREFIX)
AC_SUBST(NONSHARED_LIB_DIR)
AC_SUBST(LIBDIR)
+DEFAULT_MERCURY_DEBUGGER_INIT_DIR=$LIBDIR/mdb
+AC_SUBST(DEFAULT_MERCURY_DEBUGGER_INIT_DIR)
+
#-----------------------------------------------------------------------------#
#
# Source the build_vars script to get the variables whoes bindings
@@ -156,6 +159,23 @@
AC_SUBST(MKNOD)
PATH="$save_PATH"
+#-----------------------------------------------------------------------------#
+MERCURY_MSG("looking for a way to create temporary files...")
+
+AC_PATH_PROG(MKTEMP,mktemp)
+if test "$MKTEMP" != ""; then
+ # check that it really works
+ TMPFILE="`mktemp /tmp/configure.XXXXXX < /dev/null`"
+ case "$TMPFILE" in
+ /tmp/configure.*) rm -f $TMPFILE ;;
+ *) MKTEMP="" ;;
+ esac
+fi
+if test "$MKTEMP" = ""; then
+ AC_MSG_WARN(cannot find a working \`mktemp', using \`mkdir || exit'')
+ MKTEMP=""
+fi
+AC_SUBST(MKTEMP)
#-----------------------------------------------------------------------------#
AC_PROG_CC
AC_SUBST(CC)
--
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