Further fix for -d regression.

diff --git a/src/install.c b/src/install.c
index e913cb2a01e7e7d1bc772179b1f8584d60dcf603..f69eaaf4d0e3a88d8372d9b9c38befd51d884606 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -325,7 +325,7 @@ main (int argc, char **argv)
   n_files = argc - optind;
   file = argv + optind;
 
-  if (n_files <= !(dir_arg || target_directory))
+  if (n_files <= ! (dir_arg || target_directory))
     {
       if (n_files <= 0)
        error (0, 0, _("missing file operand"));
@@ -347,7 +347,7 @@ main (int argc, char **argv)
          usage (EXIT_FAILURE);
        }
     }
-  else if (!target_directory)
+  else if (! (dir_arg || target_directory))
     {
       if (2 <= n_files && target_directory_operand (file[n_files - 1]))
        target_directory = file[--n_files];

diff --git a/tests/install/basic-1 b/tests/install/basic-1
index eb5e627e53af0899e0af4e3f6a1500a18609e6d9..66df30415f118812b629961cf971db19e3f8410b 100755 (executable)
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -61,5 +61,6 @@ test "$1" = -r-xr-xr-x || fail=1
 # These failed in coreutils CVS from 2004-06-25 to 2004-08-11.
 ginstall -d . || fail=1
 ginstall -d newdir || fail=1
+ginstall -d newdir1 newdir2 newdir3 || fail=1
 
 (exit $fail); exit $fail