(main): update --version output to conform to coding standard

27 files changed, 28 insertions, 28 deletions

diff --git a/src/basename.c b/src/basename.c
index 30670a009..55ae9ffdf 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -93,7 +93,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "basename", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "basename", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1 || argc > 3)
     {
diff --git a/src/chroot.c b/src/chroot.c
index 477125e42..a4d066f71 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -58,7 +58,7 @@ main (int argc, char **argv)
 {
   program_name = argv[0];
 
-  parse_long_options (argc, argv, "chroot", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "chroot", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     {
diff --git a/src/date.c b/src/date.c
index 1d4ac5add..92655a734 100644
--- a/src/date.c
+++ b/src/date.c
@@ -198,7 +198,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("date - %s\n", PACKAGE_VERSION);
+      printf ("date (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/dirname.c b/src/dirname.c
index 199c525fb..b201b29af 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "dirname", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "dirname", GNU_PACKAGE, VERSION, usage);
 
   if (argc != 2)
     {
diff --git a/src/echo.c b/src/echo.c
index 06d72064d..466b7e014 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -112,7 +112,7 @@ main (int argc, char **argv)
 
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, "echo", PACKAGE_VERSION, usage);
+    parse_long_options (argc, argv, "echo", GNU_PACKAGE, VERSION, usage);
 
 /* System V machines already have a /bin/sh with a v9 behaviour.  We
    use the identical behaviour for these machines so that the
diff --git a/src/env.c b/src/env.c
index 3d22f64ef..b5a234c95 100644
--- a/src/env.c
+++ b/src/env.c
@@ -140,7 +140,7 @@ main (register int argc, register char **argv, char **envp)
 
   if (show_version)
     {
-      printf ("env - %s\n", PACKAGE_VERSION);
+      printf ("env (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/expr.c b/src/expr.c
index a82ea9c7c..fa980f6f2 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -161,7 +161,7 @@ main (int argc, char **argv)
 
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, "expr", PACKAGE_VERSION, usage);
+    parse_long_options (argc, argv, "expr", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     {
diff --git a/src/factor.c b/src/factor.c
index 89df40324..3b8b9eef5 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -182,7 +182,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "factor", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "factor", GNU_PACKAGE, VERSION, usage);
 
   fail = 0;
   if (argc == 1)
diff --git a/src/hostname.c b/src/hostname.c
index 590f79eb3..df80cddd3 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "hostname", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "hostname", GNU_PACKAGE, VERSION, usage);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)
diff --git a/src/id.c b/src/id.c
index e5d8e6213..8a25392f2 100644
--- a/src/id.c
+++ b/src/id.c
@@ -133,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("id - %s\n", PACKAGE_VERSION);
+      printf ("id (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/logname.c b/src/logname.c
index 4d10ac4ed..a582bbdc1 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("logname - %s\n", PACKAGE_VERSION);
+      printf ("logname (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/nice.c b/src/nice.c
index bd09a204a..b81b78bf7 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "nice", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "nice", GNU_PACKAGE, VERSION, usage);
 
   for (optind = 1; optind < argc; /* empty */)
     {
diff --git a/src/pathchk.c b/src/pathchk.c
index 5fd4ef219..5939f156c 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -142,7 +142,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("pathchk - %s\n", PACKAGE_VERSION);
+      printf ("pathchk (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/printenv.c b/src/printenv.c
index d4c81a519..804f85950 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -101,7 +101,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("printenv - %s\n", PACKAGE_VERSION);
+      printf ("printenv (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/printf.c b/src/printf.c
index 4c3275008..15339e848 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -140,7 +140,7 @@ main (int argc, char **argv)
 
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, "printf", PACKAGE_VERSION, usage);
+    parse_long_options (argc, argv, "printf", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     {
diff --git a/src/pwd.c b/src/pwd.c
index 406cd65bb..065c14f70 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -60,7 +60,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "pwd", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "pwd", GNU_PACKAGE, VERSION, usage);
 
   if (argc != 1)
     error (0, 0, _("ignoring non-option arguments"));
diff --git a/src/seq.c b/src/seq.c
index 402550163..fb0f11483 100644
--- a/src/seq.c
+++ b/src/seq.c
@@ -162,7 +162,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("seq - %s\n", PACKAGE_VERSION);
+      printf ("seq (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/sleep.c b/src/sleep.c
index 5e5c8e199..625ecf9dd 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -87,7 +87,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("sleep - %s\n", PACKAGE_VERSION);
+      printf ("sleep (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/stty.c b/src/stty.c
index a6fb7f573..a5632d690 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -650,7 +650,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "stty", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "stty", GNU_PACKAGE, VERSION, usage);
 
   output_type = changed;
   verbose_output = 0;
diff --git a/src/su.c b/src/su.c
index bca680bee..e8096e745 100644
--- a/src/su.c
+++ b/src/su.c
@@ -491,7 +491,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("su - %s\n", PACKAGE_VERSION);
+      printf ("su (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/tee.c b/src/tee.c
index 44c49de55..458c50ba4 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -114,7 +114,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tee - %s\n", PACKAGE_VERSION);
+      printf ("tee (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/test.c b/src/test.c
index e5d6d41b6..c4fbb3f99 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1076,7 +1076,7 @@ main (int margc, char **margv)
     {
       /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
       if (getenv ("POSIXLY_CORRECT") == NULL)
-	parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
+	parse_long_options (argc, argv, COMMAND_NAME, GNU_PACKAGE, VERSION, usage);
 
       --margc;
 
@@ -1093,7 +1093,7 @@ main (int margc, char **margv)
   if (pos >= argc)
     test_exit (SHELL_BOOLEAN (FALSE));
 
-  parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, COMMAND_NAME, GNU_PACKAGE, VERSION, usage);
   value = posixtest ();
 
   if (pos != argc)
diff --git a/src/tty.c b/src/tty.c
index 193bb5e5c..f5039a296 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tty - %s\n", PACKAGE_VERSION);
+      printf ("tty (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/uname.c b/src/uname.c
index 583031eed..ed5c1f626 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -133,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("uname - %s\n", PACKAGE_VERSION);
+      printf ("uname (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/who-users.c b/src/who-users.c
index ebf0c1920..104164194 100644
--- a/src/who-users.c
+++ b/src/who-users.c
@@ -728,7 +728,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("%s - %s\n", COMMAND_NAME, PACKAGE_VERSION);
+      printf ("%s - %s\n", COMMAND_NAME, GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/whoami.c b/src/whoami.c
index 8a7159d5b..632c7aaae 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -88,7 +88,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("whoami - %s\n", PACKAGE_VERSION);
+      printf ("whoami (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 
diff --git a/src/yes.c b/src/yes.c
index 0a1171c5a..67e70a14a 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -55,7 +55,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "yes", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "yes", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     while (1)