* 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 e3fc486ceedc4d2307fb62e578d48f4dc3d157c3..1faf499f4da25d19f1169b638d4fb7afa9d7b21a 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 b58efa4ca95a76b8d428e20c7ac080a742027a44..a7bfb0e6e0e3bae54418c472ae836d8977f16a41 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -756,24 +756,24 @@ 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"'
            case $host in
            *cygwin* | *mingw* )
-              $run eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"'
-              $run eval 'cat "$export_symbols" >> "$output_objdir/$output.def"'
+              $run eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+              $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
              ;;
            esac
          else
-           $run eval "${SED} -e 's/\([[]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+           $run eval "${SED} -e 's/\([[ ]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
            case $host in
            *cygwin | *mingw* )
-             $run eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"'
-             $run eval 'cat "$output_objdir/$output.exp" >> "$output_objdir/$output.def"'
+             $run eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+             $run eval 'cat "$output_objdir/$outputname.exp" >> "$output_objdir/$outputname.def"'
              ;;
            esac
-           $run eval '$GREP -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+           $run eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
            $run eval '$MV "$nlist"T "$nlist"'
          fi
        fi