(usage): Mention --help and --version.

(main): Handle flag_help and flag_version before checking for invocation errors.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/install.c b/src/install.c
index dd8b58cc7..d2ad40b0b 100644
--- a/src/install.c
+++ b/src/install.c
@@ -194,18 +194,18 @@ main (argc, argv)
 	}
     }
 
-  /* Check for invalid combinations of arguments. */
-  if ((dir_arg && strip_files)
-      || (optind == argc)
-      || (optind == argc - 1 && !dir_arg))
-    usage ();
-
   if (flag_version)
     fprintf (stderr, "%s\n", version_string);
 
   if (flag_help)
     usage ();
 
+  /* Check for invalid combinations of arguments. */
+  if ((dir_arg && strip_files)
+      || (optind == argc)
+      || (optind == argc - 1 && !dir_arg))
+    usage ();
+
   if (symbolic_mode)
     {
       struct mode_change *change = mode_compile (symbolic_mode, 0);
@@ -511,8 +511,8 @@ Usage: %s [options] [-s] [--strip] source dest\n\
        %s [options] [-s] [--strip] source... directory\n\
        %s [options] {-d,--directory} directory...\n\
 Options:\n\
-       [-c] [-g group] [-m mode] [-o owner]\n\
-       [--group=group] [--mode=mode] [--owner=owner]\n",
+       [-c] [-g group] [-m mode] [-o owner] [--group=group]\n\
+       [--help] [--version] [--mode=mode] [--owner=owner]\n",
 	    program_name, program_name, program_name);
   exit (1);
 }