From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 8 Jul 2005 13:47:11 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_mode_install): Do not assume `-f'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53cb1c69017877b0d44003ba62cc88a479a7f429;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_mode_install): Do not assume `-f'
needs an argument if the install program is `cp'.  Cleanup
install mode somewhat.
Reported by Juergen Leising <juergen.leising@gmx.de>.
---

diff --git a/ChangeLog b/ChangeLog
index 97b92bedd..32bc35d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config/ltmain.m4sh (func_mode_install): Do not assume `-f'
+	needs an argument if the install program is `cp'.  Cleanup
+	install mode somewhat.
+	Reported by Juergen Leising <juergen.leising@gmx.de>.
+
 2005-07-03  Thorsten Glaser  <tg@66h.42h.de>
 
 	* m4/libtool.m4 (_LT_TRY_DLOPEN_SELF): Quieten configure
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 34a169afa..8e4d6ad1d 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -1649,15 +1649,15 @@ func_mode_install ()
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $Xsed | $GREP shtool > /dev/null; then
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
-      arg="$1"
+      arg=$1
       shift
     else
       install_prog=
-      arg="$nonopt"
+      arg=$nonopt
     fi
 
     # The real first argument should be the name of the installation program.
@@ -1677,28 +1677,33 @@ func_mode_install ()
     do
       if test -n "$dest"; then
 	files="$files $dest"
-	dest="$arg"
+	dest=$arg
 	continue
       fi
 
       case $arg in
       -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
+      -f)
+      	case " $install_prog " in
+	*[[\\\ /]]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
       -s)
 	stripme=" -s"
 	continue
 	;;
-      -*) ;;
-
+      -*)
+	;;
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
 	  prev=
 	else
-	  dest="$arg"
+	  dest=$arg
 	  continue
 	fi
 	;;