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

diff --git a/src/chgrp.c b/src/chgrp.c
index 44f40be..812ef81 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -336,7 +336,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("chgrp (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("chgrp (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/chmod.c b/src/chmod.c
index 1194c4b..1f46275 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -305,7 +305,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("chmod (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("chmod (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/chown.c b/src/chown.c
index 5f0f405..71f93bd 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -302,7 +302,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("chown (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("chown (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/cp.c b/src/cp.c
index e9354fe..659369e 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -341,7 +341,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cp (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("cp (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/dd.c b/src/dd.c
index 05bdbd9..3663eb4 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -339,7 +339,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("dd (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("dd (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/df.c b/src/df.c
index 8116699..c8905cd 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -572,7 +572,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("df (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("df (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/dircolors.c b/src/dircolors.c
index 13d4520..5d6a031 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -424,7 +424,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "dircolors", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "dircolors", GNU_PACKAGE, VERSION, usage);
 
   while ((optc = getopt_long (argc, argv, "bcp", long_options, NULL))
         != EOF)

diff --git a/src/du.c b/src/du.c
index 3d20665..565f66a 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -336,7 +336,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("du (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("du (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/install.c b/src/install.c
index 653e20a..af2bd21 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -244,7 +244,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("install (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("install (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/ln.c b/src/ln.c
index 71116da..018b1d1 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -421,7 +421,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("ln (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("ln (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/ls.c b/src/ls.c
index c782f59..b04a3b0 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -662,10 +662,10 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("%s - %s\n",
+      printf ("%s (%s) %s\n",
              (ls_mode == LS_LS ? "ls"
               : (ls_mode == LS_MULTI_COL ? "dir" : "vdir")),
-             PACKAGE_VERSION);
+             GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/mkdir.c b/src/mkdir.c
index 56cc3d8..2cf25d2 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -121,7 +121,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mkdir (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("mkdir (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/mkfifo.c b/src/mkfifo.c
index 3cd6f24..87db0c1 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -106,7 +106,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mkfifo (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("mkfifo (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/mknod.c b/src/mknod.c
index 1f6a219..b5f7044 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -115,7 +115,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mknod (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("mknod (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/mv.c b/src/mv.c
index 9b9acc7..ef735a9 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -468,7 +468,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mv (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("mv (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/rm.c b/src/rm.c
index 088cf43..8d3c239 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -157,7 +157,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("rm (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("rm (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/rmdir.c b/src/rmdir.c
index 31246c7..065a1cb 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -125,7 +125,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("rmdir (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("rmdir (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/sync.c b/src/sync.c
index 90a1578..bed0bfc 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -56,7 +56,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "sync", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "sync", GNU_PACKAGE, VERSION, usage);
 
   if (argc != 1)
     error (0, 0, _("ignoring all arguments"));

diff --git a/src/touch.c b/src/touch.c
index 69ebbf4..c5a3baa 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -341,7 +341,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("touch (GNU %s) %s\n", PACKAGE, VERSION);
+      printf ("touch (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }