* ltmain.in (install mode): 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 ad794ada75f183b7897e3ac8437b60eae5f08b53..af87d5c6e5d69223fb70e54542c35e4f37d4e5b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * ltmain.in (install mode): 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>
 
        * libtool.m4 (_LT_AC_TRY_DLOPEN_SELF): Quieten configure output

diff --git a/ltmain.in b/ltmain.in
index 363a1d255c424d6ce639facaa235494710d9a73e..ee6debeaf6f59e41f226406c770b1f4be2859b1a 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -5361,7 +5361,7 @@ relink_command=\"$relink_command\""
     # 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.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case $arg in
@@ -5374,7 +5374,7 @@ relink_command=\"$relink_command\""
       shift
     else
       install_prog=
-      arg="$nonopt"
+      arg=$nonopt
     fi
 
     # The real first argument should be the name of the installation program.
@@ -5399,28 +5399,31 @@ relink_command=\"$relink_command\""
     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
        ;;