* ltmain.in (link mode) [cygwin]: Fix broken subdir path

computation, exposed by using `-dlopen self'.  Fix broken sed
script exposed by additionally using `-export-symbols FILE'.

diff --git a/ChangeLog b/ChangeLog
index d5c563c757f8c73e72c3462825c548f752c491cc..b4634a69fc5294bc8df769731b984ddce9ae5e97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-03  Reid Spencer  <reid@x10sys.com>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * ltmain.in (link mode) [cygwin]: Fix broken subdir path
+       computation, exposed by using `-dlopen self'.  Fix broken sed
+       script exposed by additionally using `-export-symbols FILE'.
+
 2005-02-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/quote.test: Backport fix for spurious failures on Cygwin.

diff --git a/ltmain.in b/ltmain.in
index 1f37b6f9cde8891f26396031289700806427e9e8..594f4c5ba75953542f200b90252a6211d84ced35 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -4364,12 +4364,12 @@ extern \"C\" {
 
            # Prepare the list of exported symbols
            if test -z "$export_symbols"; then
-             export_symbols="$output_objdir/$output.exp"
+             export_symbols="$output_objdir/$outputname.exp"
              $run $rm $export_symbols
              $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
            else
-             $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-             $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+             $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+             $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
              $run eval 'mv "$nlist"T "$nlist"'
            fi
          fi