From ab7bd8554cd03e2769d6fe692caa847858003455 Mon Sep 17 00:00:00 2001 From: Charles Wilson Date: Fri, 8 Oct 2004 16:17:40 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ config/ltmain.m4sh | 2 +- tests/pdemo-inst.test | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5ab34e8e..b4bad5960 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-10-08 Charles Wilson + + * 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-08 Gary V. Vaughan Fix some issues that mangled the reexecution path to a script, diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh index d5f1ce87c..28ec84976 100644 --- 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 747e1be5e..a2571968b 100755 --- 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' -- 2.47.2