Index: ChangeLog =================================================================== RCS file: /cvsroot/libtool/libtool/ChangeLog,v retrieving revision 1.1204 diff -u -r1.1204 ChangeLog --- ChangeLog 2 Mar 2003 10:13:46 -0000 1.1204 +++ ChangeLog 3 Mar 2003 11:13:35 -0000 @@ -1,3 +1,8 @@ +2003-03-03 Wesley W. Terpstra + + * ltmain.in: don't accumulate directory information on clean. + * ltmain.in: include correctly pathed wrapper sript + 2003-03-02 Alexandre Oliva * libtool.m4 (AC_PROG_LD): Use $CC instead of GCC. Index: ltmain.in =================================================================== RCS file: /cvsroot/libtool/libtool/ltmain.in,v retrieving revision 1.326 diff -u -r1.326 ltmain.in --- ltmain.in 28 Feb 2003 15:27:35 -0000 1.326 +++ ltmain.in 3 Mar 2003 11:14:25 -0000 @@ -5795,13 +5795,14 @@ 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" @@ -5912,7 +5913,7 @@ # 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 @@ -5930,6 +5931,7 @@ $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