* tests/pdemo-inst.test: pdemo-inst should depend on pdemo-make.

* config/ltmain.m4sh: Windows and Cygwin reserve the .lnk
extension to represent shortcuts.  Use the extension ".lnkscript"
rather than ".lnk" for the piecewise linking ld script in order to
avoid the conflict.

diff --git a/ChangeLog b/ChangeLog
index d9f299b1e3f1c4d655f03102e6ee04753783beb5..ad80bb578e25b2b3bb42d394d81e8f94d1c8ce72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-08  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+       * tests/pdemo-inst.test: pdemo-inst should depend on pdemo-make.
+       * config/ltmain.m4sh: Windows and Cygwin reserve the .lnk
+       extension to represent shortcuts.  Use the extension ".lnkscript"
+       rather than ".lnk" for the piecewise linking ld script in order to
+       avoid the conflict.
+
 2004-10-07  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libltdl/ltdl.c (lt_dlexit, lt_dlpath_insertdir): Fix memleaks,
@@ -41,6 +49,7 @@
        * config/ltmain.m4sh [darwin]: Make the -dylib_file flag work on
        older darwins too. Reported by Christoph Egger.
 
+>>>>>>> 1.1681
 2004-10-05  Gary V. Vaughan  <gary@gnu.org>
 
        * configure.ac: Bumped version to 2.1a.

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index d5f1ce87c51d3e12d13c0d66bb5540021d7a2c5f..28ec84976ef8adafb1132774b36a7b8cba3e3ca8 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -4994,7 +4994,7 @@ EOF
          k=1
 
          if test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-           output=${output_objdir}/${output_la}.lnk
+           output=${output_objdir}/${output_la}.lnkscript
            func_echo "creating GNU ld script: $output"
            $ECHO 'INPUT (' > $output
            for obj in $save_libobjs

diff --git a/tests/pdemo-inst.test b/tests/pdemo-inst.test
index 747e1be5ea99e74147e1f7f6ef6594e996d2a701..a2571968bffa73f754ee42205c9fa5a5a09ba2cf 100755 (executable)
--- a/tests/pdemo-inst.test
+++ b/tests/pdemo-inst.test
@@ -23,10 +23,10 @@
 
 . ./defs || exit 1
 
-func_require "demo-make" "demo/hell$EXEEXT"
+func_require "pdemo-make" "demo/hell$EXEEXT"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "pdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'