From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 6 Apr 2001 23:48:28 +0000 (+0000)
Subject: * ltmain.in (clean,uninstall): Do not error if the file doesn't
X-Git-Tag: release-1-4~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba91447e795902ae04c5785e07cc5ac82254b8cc;p=thirdparty%2Flibtool.git

* ltmain.in (clean,uninstall): Do not error if the file doesn't
exist and 'rm -f' was used.  Exit with status 1 on error.
---

diff --git a/ChangeLog b/ChangeLog
index abea419a5..f0e56c77c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-07  Peter Eisentraut  <peter_e@gmx.net>
+
+	* ltmain.in (clean,uninstall): Do not error if the file doesn't
+	exist and 'rm -f' was used.  Exit with status 1 on error.
+
 2001-04-06  Nick Hudson  <skrll@netbsd.org>
 
 	* ltmain.in: Implement a new deplibs_check_method called
diff --git a/ltmain.in b/ltmain.in
index ae846a4b6..16025a381 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -4434,7 +4434,7 @@ relink_command=\"$relink_command\""
     echo
     echo "If you ever happen to want to link against installed libraries"
     echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
     echo "flag during linking and do at least one of the following:"
     if test -n "$shlibpath_var"; then
       echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
@@ -4610,6 +4610,8 @@ relink_command=\"$relink_command\""
     modename="$modename: $mode"
     rm="$nonopt"
     files=
+    rmforce=
+    exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
@@ -4618,6 +4620,7 @@ relink_command=\"$relink_command\""
     for arg
     do
       case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
       -*) rm="$rm $arg" ;;
       *) files="$files $arg" ;;
       esac
@@ -4650,6 +4653,11 @@ relink_command=\"$relink_command\""
 	esac
       fi
 
+      # Don't error if the file doesn't exist and rm -f was used.
+      if test ! -e "$file" && test "$rmforce" = yes; then
+        continue
+      fi
+
       rmfiles="$file"
 
       case $name in
@@ -4674,6 +4682,9 @@ relink_command=\"$relink_command\""
 		IFS="$save_ifs"
 		$show "$cmd"
 		$run eval "$cmd"
+		if test $? != 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
 	      done
 	      IFS="$save_ifs"
 	    fi
@@ -4686,6 +4697,9 @@ relink_command=\"$relink_command\""
 		IFS="$save_ifs"
 		$show "$cmd"
 		$run eval "$cmd"
+		if test $? != 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
 	      done
 	      IFS="$save_ifs"
 	    fi
@@ -4716,7 +4730,7 @@ relink_command=\"$relink_command\""
 	;;
       esac
       $show "$rm $rmfiles"
-      $run $rm $rmfiles
+      $run $rm $rmfiles || exit_status=1
     done
 
     # Try to remove the ${objdir}s in the directories where we deleted files
@@ -4727,7 +4741,7 @@ relink_command=\"$relink_command\""
       fi
     done
 
-    exit 0
+    exit $exit_status
     ;;
 
   "")