merge with 3.8.4k

1 files changed, 9 insertions, 10 deletions

diff --git a/src/install.c b/src/install.c
index b9f34f33f..a5e795e3f 100644
--- a/src/install.c
+++ b/src/install.c
@@ -540,15 +540,18 @@ static void
 usage (status)
      int status;
 {
-  fprintf (status == 0 ? stdout : stderr, "\
+  if (status != 0)
+    fprintf (stderr, "Try `%s --help' for more information.\n",
+	     program_name);
+  else
+    {
+      printf ("\
 Usage: %s [OPTION]... SOURCE DEST           (1st format)\n\
   or:  %s [OPTION]... SOURCE... DIRECTORY   (2nd format)\n\
   or:  %s [OPTION]... DIRECTORY...          (3nd format)\n\
 ",
-	    program_name, program_name, program_name);
-
-  if (status == 0)
-    printf ("\
+	      program_name, program_name, program_name);
+      printf ("\
 \n\
   -c                  (ignored)\n\
   -d, --directory     create [leading] directories, mandatory for 3rd format\n\
@@ -558,10 +561,6 @@ Usage: %s [OPTION]... SOURCE DEST           (1st format)\n\
   -s, --strip         strip symbol tables, only for 1st and 2nd formats\n\
       --help          display this help and exit\n\
       --version       output version information and exit\n");
-
-  else
-    fprintf (stderr, "Try `%s --help' for more information.\n",
-	     program_name);
-
+    }
   exit (status);
 }