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

diff --git a/src/chgrp.c b/src/chgrp.c
index 44f40be5076e2d8868d18953bfb8d32dbf1e101c..812ef8106b80c8cad266f503103f8f49d1d33df9 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 1194c4b1548fcb2ec4db4aa968f6d741725a75fb..1f462756e88be38db6f11283ae9c54a48c4b355e 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 5f0f405fdc3e52b38777263a3792611738c429fb..71f93bde74e7753cf4934f9104e0b45eba4efc2c 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 e9354fea1d3d973d5c37ce47a67504faa6086198..659369e35937c6f81cbf6ae0a695997b150efd2c 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 05bdbd96c29ac57fb2fe6c89a98b61280e212325..3663eb450cfc62246591519858d7e88bd373e62f 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 8116699f6956795c0895021f385cf3b75f6f4a5e..c8905cd18793e2c438cf0401e97be7938bd445d0 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 13d4520bfb70c67fdca3ce49643558de449cb2c3..5d6a031f27c33874a7ce7ba35e5ad71f0d630288 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 3d20665f9e2175c7d94b97ae09a570c401e2d6da..565f66a7e36f24efa2311aca8642fd4d9a6d9f5d 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 653e20a7a2925136d1834ccaa049f3bedb9b7eb3..af2bd21bdba3b8ebeed77911282f2cce44b0a9c7 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 71116dac1a6adf0ee0d27809ac8cb47b49673514..018b1d1b2d75b580bd6969613da6395ec4979b34 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 c782f59be000e97564b177922ce410fcbbe5fb9e..b04a3b002ff051fe3b76ca8815902b54d2891e24 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 56cc3d8cc6b7b66d13513d57a38470382cb116d6..2cf25d2d48bfda10745acbf4e9ee3843b25db071 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 3cd6f244d9b074da532fab475765abd93098970f..87db0c10c1d7c29ad0c86b200222c76b26a3048d 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 1f6a2197ce2f16904f5ca4cff1c1fcc73043bfe8..b5f70441a7dd0789c532d75a9442503c9228a685 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 9b9acc7b12fe5ef126b7ead345ada2b4c21e34ce..ef735a94b2321bb81f77bdd0fdba795aac4f8d55 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 088cf4362f3051590a8a7e015230420c74b65c4a..8d3c239fddb5183f0bc5fd3085dabf0ac203aa25 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 31246c730ae5194a2129148b5b04a1d8f8183ffc..065a1cb8a25c835cf803069ba9d2b463e6de01fb 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 90a15784bff00e729db41706e80b93edae8f89e2..bed0bfcbadcdd4a2215d25c512c549e104417a73 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 69ebbf425c963e7dadccde57347f222b2298aa35..c5a3baa9ed4b8e051d99db780057b1040f149431 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);
     }