* ltmain.in: strip off the .exe suffix only on *Win

  (Reported by Matthew D. Langston <langston@SLAC.Stanford.EDU>)

diff --git a/ChangeLog b/ChangeLog
index 7bea59c94e722373f6f44d9362466946dd34e7e3..65bfe2e8ba6a3d9ca78db21dff53a0a7fff6c27f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-23 Thomas Tanner  <tanner@ffii.org>
+
+       * ltmain.in: strip off the .exe suffix only on *Win
+         (Reported by Matthew D. Langston <langston@SLAC.Stanford.EDU>)
+       
 1999-05-22 Thomas Tanner  <tanner@ffii.org>
 
        * NEWS: updated

diff --git a/bootstrap b/bootstrap
index 1869b2fd53502da123a2b55a2e4f4393c6df9d45..8de3de847bcd2a7e46d24233ec448547e0fa2724 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -11,7 +11,7 @@ touch ltconfig
 touch ltmain.sh
 touch libtoolize
 aclocal
-automake --gnits --add-missing
+automake --gnu --add-missing
 autoconf
 
 for sub in demo depdemo libltdl mdemo cdemo; do

diff --git a/depdemo/README b/depdemo/README
index f122fabfb30bf093507614946f08185d234f1017..30d716684817aec49e96802d4858e33fd4e30450 100644 (file)
--- a/depdemo/README
+++ b/depdemo/README
@@ -8,4 +8,4 @@ l2 depends on l1.
 l3 depends on l1 and l2.
 l4 depends on l3 and libm.
 
-The test program uses l1, l2 and l4.
\ No newline at end of file
+The test program uses l1, l2 and l4.

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 831ce281bc33e6444ad167a4f61d9512f876fd15..12bdcbbf1be9ddef057b855f03f669461eb7c58d 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -42,4 +42,3 @@ local-install-files: $(DISTFILES)
            || cp -p $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
          fi; \
        done
-

diff --git a/ltmain.in b/ltmain.in
index fd9864fc79ba9f06ecb85b8a9ea01dc73b35269f..b58f7850017ee98f82988684a1ee00d06a7ee1cf 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3262,10 +3262,14 @@ static const void *lt_preloaded_setup() {
 
       # Only actually do things if our run command is non-null.
       if test -z "$run"; then
-       # win32 will think the script is a binary if it has
-       # a .exe suffix, so we strip it off here.
-       case $output in
-         *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+       case "$host" in
+       *-*-cygwin* | *-*-mingw* | *-*-os2*)
+         # win32 will think the script is a binary if it has
+         # a .exe suffix, so we strip it off here.
+         case $output in
+           *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+         esac
+         ;;
        esac
        $rm $output
        trap "$rm $output; exit 1" 1 2 15