* ltmain.in: Don't accumulate directory information in clean mode.

Include properly pathed wrapper script.

diff --git a/ChangeLog b/ChangeLog
index 2a74a52f3a6c671df47123335cfde019d43d802a..34e477c7d366cb9619f04594b16fd404060b4ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-21  Wesley W. Terpstra <terpstra@ito.tu-darmstadt.de>
+
+       * ltmain.in: Don't accumulate directory information in clean mode.
+       Include properly pathed wrapper script.
+
 2003-03-21  Peter O'Gorman  <peter@pogma.com>
 
        * README: Remove "Important" information about patching automake.

diff --git a/ltmain.in b/ltmain.in
index c3807697a68b9710ae5fdee4ab3eb5cbdcc77325..1b13c1ccb0d2701ba50fa9330263d9d7134e829e 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -5843,13 +5843,14 @@ relink_command=\"$relink_command\""
 
     rmdirs=
 
+    origobjdir="$objdir"
     for file in $files; do
       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
       if test "X$dir" = "X$file"; then
        dir=.
-       objdir="$objdir"
+       objdir="$origobjdir"
       else
-       objdir="$dir/$objdir"
+       objdir="$dir/$origobjdir"
       fi
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
       test "$mode" = uninstall && objdir="$dir"
@@ -5960,7 +5961,7 @@ relink_command=\"$relink_command\""
          # Do a test to see if this is a libtool program.
          if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
            relink_command=
-           . $dir/$file
+           . $dir/$noexename
 
            # note $name still contains .exe if it was in $file originally
            # as does the version of $file that was added into $rmfiles
@@ -5978,6 +5979,7 @@ relink_command=\"$relink_command\""
       $show "$rm $rmfiles"
       $run $rm $rmfiles || exit_status=1
     done
+    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do