mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-01-18 14:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* ltmain.in (clean,uninstall): Do not error if the file doesn't

Browse Source 
exist and 'rm -f' was used.  Exit with status 1 on error.
This commit is contained in:
Peter Eisentraut 2001-04-06 23:48:28 +00:00 committed by Gary V. Vaughan
parent b9158c9d28
commit ba91447e79
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2001-04-06 Nick Hudson <skrll@netbsd.org>
* ltmain.in: Implement a new deplibs_check_method called * ltmain.in: Implement a new deplibs_check_method called

20
ltmain.in
View File

@ -4434,7 +4434,7 @@ relink_command=\"$relink_command\""
echo echo
echo "If you ever happen to want to link against installed libraries" 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 "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:" echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then if test -n "$shlibpath_var"; then
echo " - add LIBDIR to the \`$shlibpath_var' environment variable" echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
@ -4610,6 +4610,8 @@ relink_command=\"$relink_command\""
modename="$modename: $mode" modename="$modename: $mode"
rm="$nonopt" rm="$nonopt"
files= files=
rmforce=
exit_status=0
# This variable tells wrapper scripts just to set variables rather # This variable tells wrapper scripts just to set variables rather
# than running their programs. # than running their programs.
@ -4618,6 +4620,7 @@ relink_command=\"$relink_command\""
for arg for arg
do do
case $arg in case $arg in
-f) rm="$rm $arg"; rmforce=yes ;;
-*) rm="$rm $arg" ;; -*) rm="$rm $arg" ;;
*) files="$files $arg" ;; *) files="$files $arg" ;;
esac esac
@ -4650,6 +4653,11 @@ relink_command=\"$relink_command\""
esac esac
fi 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" rmfiles="$file"
case $name in case $name in
@ -4674,6 +4682,9 @@ relink_command=\"$relink_command\""
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
$run eval "$cmd" $run eval "$cmd"
if test $? != 0 && test "$rmforce" != yes; then
exit_status=1
fi
done done
IFS="$save_ifs" IFS="$save_ifs"
fi fi
@ -4686,6 +4697,9 @@ relink_command=\"$relink_command\""
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
$run eval "$cmd" $run eval "$cmd"
if test $? != 0 && test "$rmforce" != yes; then
exit_status=1
fi
done done
IFS="$save_ifs" IFS="$save_ifs"
fi fi
@ -4716,7 +4730,7 @@ relink_command=\"$relink_command\""
;; ;;
esac esac
$show "$rm $rmfiles" $show "$rm $rmfiles"
$run $rm $rmfiles $run $rm $rmfiles || exit_status=1
done done
# Try to remove the ${objdir}s in the directories where we deleted files # Try to remove the ${objdir}s in the directories where we deleted files
@ -4727,7 +4741,7 @@ relink_command=\"$relink_command\""
fi fi
done done
exit 0 exit $exit_status
;; ;;
"") "")