* 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 14addcd04215a60557c9fb6a7b0c72c71174a9d6..4d591d814f3c3e0c73bf0d6618cc204b7413758d 100644 (file)
--- 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 1c407e44f2983b67bfce6b8acfe84f5cb9f4596e..a87a0faad70dca49e3b34ec34228237ec3a383d6 100644 (file)
--- 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