[m-dev.] diff: fix EXT_FOR_EXE bug in bindist

[Tyson Dowd]

Hi,

Here's another fix I will apply to the version-0_9_x branch and the
main development line.

===================================================================


Estimated hours taken: 1.5

Fix problems with binary distribution on windows.  The problem was 
the installation of the bindist would fail when the executables
in the utils directory were copied, because they had a .exe suffix.


bindist/bindist.Makefile.in:
	Use EXT_FOR_EXE generate the filenames for executables in the
	utils directory.  

bindist/bindist.build_vars.in:
bindist/bindist.configure.in:
	Pass EXT_FOR_EXE along from the top level configure.
	


Index: bindist/bindist.Makefile.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/bindist/bindist.Makefile.in,v
retrieving revision 1.23
diff -u -r1.23 bindist.Makefile.in
--- bindist/bindist.Makefile.in	1999/12/19 19:55:38	1.23
+++ bindist/bindist.Makefile.in	1999/12/24 02:42:31
@@ -30,8 +30,13 @@
 
 LIB_PARTS		= bin doc html inc ints lib mdb/mdb_doc modules
 
+EXT_FOR_EXE		= @EXT_FOR_EXE@
+
+UTIL_PROGS		= util/mkinit util/mdemangle
+UTIL_PROGFILENAMES	= $(UTIL_PROGS:%=%$(EXT_FOR_EXE))
+
 # Any miscellaneous scripts and utilities not processed by configure
-UTILS			= util/mdemangle util/mkinit util/mtags \
+UTILS			= $(UTIL_PROGFILENAMES) util/mtags \
 			  util/mprof_merge_runs util/vpath_find \
 			  util/mercury_cleanup_install
 
Index: bindist/bindist.build_vars.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/bindist/bindist.build_vars.in,v
retrieving revision 1.11
diff -u -r1.11 bindist.build_vars.in
--- bindist/bindist.build_vars.in	1999/11/23 07:24:00	1.11
+++ bindist/bindist.build_vars.in	1999/12/24 02:42:31
@@ -25,6 +25,7 @@
 EXE_RPATH_SEP="@EXE_RPATH_SEP@"
 SHLIB_RPATH_OPT="@SHLIB_RPATH_OPT@"
 SHLIB_RPATH_SEP="@SHLIB_RPATH_SEP@"
+EXT_FOR_EXE="@EXT_FOR_EXE@"
 EXT_FOR_PIC_OBJECTS="@EXT_FOR_PIC_OBJECTS@"
 EXT_FOR_SHARED_LIB="@EXT_FOR_SHARED_LIB@"
 CFLAGS_FOR_PIC="@CFLAGS_FOR_PIC@"
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/bindist/bindist.configure.in,v
retrieving revision 1.26
diff -u -r1.26 bindist.configure.in
--- bindist/bindist.configure.in	1999/11/23 07:24:01	1.26
+++ bindist/bindist.configure.in	1999/12/24 02:42:31
@@ -56,6 +56,7 @@
 AC_SUBST(EXE_RPATH_SEP)
 AC_SUBST(SHLIB_RPATH_OPT)
 AC_SUBST(SHLIB_RPATH_SEP)
+AC_SUBST(EXT_FOR_EXE)
 AC_SUBST(EXT_FOR_PIC_OBJECTS)
 AC_SUBST(EXT_FOR_SHARED_LIB)
 AC_SUBST(SHARED_LIBS)


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't eveyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------