From: Peter Ekberg <peda@lysator.liu.se>
Date: Wed, 21 Sep 2005 12:32:43 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (func_mode_uninstall): Clean
X-Git-Tag: release-2-1b~508
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb92b0d315da47b086663d11cc4b124d66518e7;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (func_mode_uninstall): Clean
up $dlname as well when cleaning a uninstalled libtool
library. Fixes -mode=clean on Cygwin and MinGW to actually
remove the dll when cleaning up an uninstalled library.
---

diff --git a/ChangeLog b/ChangeLog
index 08af0b150..027c28c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-21  Peter Ekberg  <peda@lysator.liu.se>,
+
+	* libltdl/config/ltmain.m4sh (func_mode_uninstall): Clean
+	up $dlname as well when cleaning a uninstalled libtool
+	library. Fixes -mode=clean on Cygwin and MinGW to actually
+	remove the dll when cleaning up an uninstalled library.
+
 2005-09-20  Peter Ekberg  <peda@lysator.liu.se>,
 
 	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG):
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 6289c92d6..7967a6f18 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6564,9 +6564,17 @@ func_mode_uninstall ()
 	    rmfiles="$rmfiles $objdir/$n"
 	  done
 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 
-	  if test "$mode" = uninstall; then
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
 	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
@@ -6577,7 +6585,8 @@ func_mode_uninstall ()
 	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;