From: Reid Spencer <reid@x10sys.com>
Date: Thu, 3 Feb 2005 16:31:02 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_generate_dlsyms): Fix broken subdir
X-Git-Tag: release-2-1b~755
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0937049824ccb5c254f4d035a534b80c6362e9a5;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_generate_dlsyms): 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 14addcd04..4d591d814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-03  Reid Spencer  <reid@x10sys.com>,
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config/ltmain.m4sh (func_generate_dlsyms): 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>
 
 	* THANKS: Update.
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 1c407e44f..a87a0faad 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -803,27 +803,27 @@ 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"
 	    $opt_dry_run || {
 	      $RM $export_symbols
 	      eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
 	      *cygwin* | *mingw* )
-                eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$output.def"'
+                eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
 	        ;;
 	      esac
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([[]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+	      eval "${SED} -e 's/\([[ ]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      case $host in
 	        *cygwin | *mingw* )
-	          eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"'
-	          eval 'cat "$output_objdir/$output.exp" >> "$output_objdir/$output.def"'
+	          eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$output_objdir/$outputname.exp" >> "$output_objdir/$outputname.def"'
 	          ;;
 	      esac
-	      eval '$GREP -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	    }
 	  fi