From: Reid Spencer <reid@x10sys.com>
Date: Thu, 3 Feb 2005 12:58:07 +0000 (+0000)
Subject: * ltmain.in (link mode) [cygwin]: Fix broken subdir path
X-Git-Tag: release-1-5-12~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5592145d1697c59237db34bf26dae4ca5bd6e212;p=thirdparty%2Flibtool.git

* 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 d5c563c75..b4634a69f 100644
--- 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 1f37b6f9c..594f4c5ba 100644
--- 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