From caae957ee4fa2c027cb6a5912e1daf980484b2c1 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 18 May 2006 19:15:12 +0000 Subject: [PATCH] in a couple of places, install needs to know that the binary actually has an .exe suffix under Cygwin svn: r2973 --- src/configure | 7 ++++++- src/mzscheme/configure.ac | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/configure b/src/configure index e9485f9eab..3db3ddfe82 100755 --- a/src/configure +++ b/src/configure @@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all foreign/gcc/libffi" ac_subdirs_all="$ac_subdirs_all llvm/llvm" ac_subdirs_all="$ac_subdirs_all wxcommon/jpeg" ac_subdirs_all="$ac_subdirs_all wxxt/src/x/wbuild" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PREFLAGS COMPFLAGS PROFFLAGS SED AS AR STATIC_AR ARFLAGS WBUILD CC_FOR_BUILD REZ MZLINKER PLAIN_CC DYN_CFLAGS x_includes x_libraries OPTIONS MZOPTIONS CGCOPTIONS GC2OPTIONS MROPTIONS GCDIR MZBINTARGET MZINSTALLTARGET EXTRA_GMP_OBJ OSX NOT_OSX FRAMEWORK_INSTALL_DIR FRAMEWORK_REL_INSTALL INSTALL_ORIG_TREE MREDLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH MAKE_MRED MAKE_MRED3M MAKE_MREDINSTALL MAKE_MREDINSTALL3M MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG JPEG_A JPEG_INC ZLIB_A ZLIB_INC PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_OBJSLIB_IF_USED FOREIGN_LIB_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBMZSCHEME_DEP LIBMRED_DEP LLVMTARGET LTO LTA collectsdir libpltdir includepltdir docdir COLLECTS_PATH subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PREFLAGS COMPFLAGS PROFFLAGS SED AS AR STATIC_AR ARFLAGS WBUILD CC_FOR_BUILD REZ MZLINKER PLAIN_CC DYN_CFLAGS x_includes x_libraries OPTIONS MZOPTIONS CGCOPTIONS GC2OPTIONS MROPTIONS GCDIR MZBINTARGET MZINSTALLTARGET EXTRA_GMP_OBJ OSX NOT_OSX FRAMEWORK_INSTALL_DIR FRAMEWORK_REL_INSTALL INSTALL_ORIG_TREE EXE_SUFFIX MREDLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH MAKE_MRED MAKE_MRED3M MAKE_MREDINSTALL MAKE_MREDINSTALL3M MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG JPEG_A JPEG_INC ZLIB_A ZLIB_INC PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_OBJSLIB_IF_USED FOREIGN_LIB_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBMZSCHEME_DEP LIBMRED_DEP LLVMTARGET LTO LTA collectsdir libpltdir includepltdir docdir COLLECTS_PATH subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5172,6 +5172,8 @@ LIBMZSCHEME_DEP="" XFT_EXTRA_FLAGS= XFT_EXTRA_LIBS= +EXE_SUFFIX= + ###### OSKit stuff ####### if test "${enable_oskit}" = "yes" ; then @@ -8601,6 +8603,7 @@ case $OS in LIBMZSCHEME_DEP="libmzgc.la -liconv" LIBMRED_DEP="../mzscheme/libmzgc.la ../mzscheme/libmred.la" fi + EXE_SUFFIX=".exe" ;; BeOS) if test "${enable_sgcdebug}" = "yes" ; then @@ -11835,6 +11838,7 @@ LIBS="$LIBS $EXTRALIBS" + mk_needed_dir() @@ -12672,6 +12676,7 @@ s,@NOT_OSX@,$NOT_OSX,;t t s,@FRAMEWORK_INSTALL_DIR@,$FRAMEWORK_INSTALL_DIR,;t t s,@FRAMEWORK_REL_INSTALL@,$FRAMEWORK_REL_INSTALL,;t t s,@INSTALL_ORIG_TREE@,$INSTALL_ORIG_TREE,;t t +s,@EXE_SUFFIX@,$EXE_SUFFIX,;t t s,@MREDLINKER@,$MREDLINKER,;t t s,@LIBSFX@,$LIBSFX,;t t s,@WXLIBS@,$WXLIBS,;t t diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac index a3d734f631..1d2c71d477 100644 --- a/src/mzscheme/configure.ac +++ b/src/mzscheme/configure.ac @@ -240,6 +240,8 @@ LIBMZSCHEME_DEP="" XFT_EXTRA_FLAGS= XFT_EXTRA_LIBS= +EXE_SUFFIX= + ###### OSKit stuff ####### if test "${enable_oskit}" = "yes" ; then @@ -471,6 +473,7 @@ case $OS in LIBMZSCHEME_DEP="libmzgc.la -liconv" LIBMRED_DEP="../mzscheme/libmzgc.la ../mzscheme/libmred.la" fi + EXE_SUFFIX=".exe" ;; BeOS) if test "${enable_sgcdebug}" = "yes" ; then @@ -1124,6 +1127,7 @@ AC_SUBST(NOT_OSX) AC_SUBST(FRAMEWORK_INSTALL_DIR) AC_SUBST(FRAMEWORK_REL_INSTALL) AC_SUBST(INSTALL_ORIG_TREE) +AC_SUBST(EXE_SUFFIX) AC_SUBST(MREDLINKER) AC_SUBST(LIBSFX)