From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 15 Jun 2010 03:19:45 +0000 (+0200)
Subject: Fix cleaning of uninstalled w32 shell wrapper in subdirs.
X-Git-Tag: v2.4~152
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=66c97302adc03fc1aa507ccccd8ecd6ddb86392e;p=thirdparty%2Flibtool.git

Fix cleaning of uninstalled w32 shell wrapper in subdirs.

* libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not
override global objdir variable, instead use odir for the
directory of to-be-removed files.  Drop unneeded origobjdir.
Report by Charles Wilson.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 8629a7479..a17d9aa6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix cleaning of uninstalled w32 shell wrapper in subdirs.
+	* libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not
+	override global objdir variable, instead use odir for the
+	directory of to-be-removed files.  Drop unneeded origobjdir.
+	Report by Charles Wilson.
+
 2010-06-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Enable colored Autotest testsuite output if available.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index dd883a618..74c711421 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7961,24 +7961,23 @@ func_mode_uninstall ()
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
+      # Remember odir for removal later, being careful to avoid duplicates
       if test "$mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) rmdirs="$rmdirs $odir" ;;
 	esac
       fi
 
@@ -8004,18 +8003,18 @@ func_mode_uninstall ()
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    rmfiles="$rmfiles $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && rmfiles="$rmfiles $odir/$old_library"
 
 	  case "$mode" in
 	  clean)
 	    case "  $library_names " in
 	    # "  " in the beginning catches empty $dlname
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) rmfiles="$rmfiles $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && rmfiles="$rmfiles $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8082,12 +8081,12 @@ func_mode_uninstall ()
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    rmfiles="$rmfiles $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      rmfiles="$rmfiles $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      rmfiles="$rmfiles $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8095,7 +8094,6 @@ func_mode_uninstall ()
       esac
       func_show_eval "$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