From a986ae20e51b2739492561d84c62613b2d34a33b Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Sat, 22 Mar 2003 06:46:07 +0000 Subject: [PATCH] * ltmain.in: Don't accumulate directory information in clean mode. Include properly pathed wrapper script. --- ChangeLog | 5 +++++ ltmain.in | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a74a52f..34e477c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-21 Wesley W. Terpstra + + * ltmain.in: Don't accumulate directory information in clean mode. + Include properly pathed wrapper script. + 2003-03-21 Peter O'Gorman * README: Remove "Important" information about patching automake. diff --git a/ltmain.in b/ltmain.in index c3807697..1b13c1cc 100644 --- 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