* ltmain.in (link mode): With piecewise (partial) linking, fix

intermediate output name for subdir-objects.

diff --git a/ChangeLog b/ChangeLog
index 4cd47bcf56d74c39c6b77d2be8c7d67dcfde47fc..61cc870476b037cac4724d2d98468a63bb86f2de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-03 Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * ltmain.in (link mode): With piecewise (partial) linking, fix
+       intermediate output name for subdir-objects.
+
        * ltmain.in (link mode): Backport yet another cygwin subdir fix
        (wrappersource).
 

diff --git a/ltmain.in b/ltmain.in
index 25e68803cb57a26636dc49c9c05ad0633fd0fe4c..f8d5b1f4bebc123b7afc4a873006da10289d976a 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3910,6 +3910,7 @@ EOF
            save_libobjs=$libobjs
          fi
          save_output=$output
+         output_la=`$echo "X$output" | $Xsed -e "$basename"`
 
          # Clear the reloadable object creation command queue and
          # initialize k to one.
@@ -3919,7 +3920,7 @@ EOF
          delfiles=
          last_robj=
          k=1
-         output=$output_objdir/$save_output-${k}.$objext
+         output=$output_objdir/$output_la-${k}.$objext
          # Loop over the list of objects to be linked.
          for obj in $save_libobjs
          do
@@ -3939,9 +3940,9 @@ EOF
                # the last one created.
                eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
              fi
-             last_robj=$output_objdir/$save_output-${k}.$objext
+             last_robj=$output_objdir/$output_la-${k}.$objext
              k=`expr $k + 1`
-             output=$output_objdir/$save_output-${k}.$objext
+             output=$output_objdir/$output_la-${k}.$objext
              objlist=$obj
              len=1
            fi
@@ -3961,13 +3962,13 @@ EOF
            eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
           fi
 
-         # Set up a command to remove the reloadale object files
+         # Set up a command to remove the reloadable object files
          # after they are used.
          i=0
          while test "$i" -lt "$k"
          do
            i=`expr $i + 1`
-           delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+           delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
          done
 
          $echo "creating a temporary reloadable object file: $output"