Don't include version.h.

(main): Use PACKAGE_VERSION instead of version_string.

diff --git a/src/chgrp.c b/src/chgrp.c
index 1f7b49042a3c8aec8978a60da654f1d3d94e850d..1c87fd49275491f931815bb96c4d2730b99a4a6a 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -36,7 +36,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "xstrtoul.h"
 #include "error.h"
 
@@ -298,7 +297,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("chgrp - %s\n", version_string);
+      printf ("chgrp - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/chmod.c b/src/chmod.c
index 29510712c73277372b4343a580507bea250b5ae1..2c8da0a2dad58c080d058697dc8713904282c68b 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -30,7 +30,6 @@
 
 #include "modechange.h"
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 void mode_string ();
@@ -297,7 +296,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("chmod - %s\n", version_string);
+      printf ("chmod - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/chown.c b/src/chown.c
index 026309df2771419b5c62669820cad07cfa9754c5..227e40884f7701c495ca6cfcf8240f565863b945 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -36,7 +36,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #ifndef _POSIX_VERSION
@@ -277,7 +276,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("chown - %s\n", version_string);
+      printf ("chown - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/cp.c b/src/cp.c
index 692a067f873ef0b06efd8ccdb2c265438182f0ae..3000aa66a003674ebd7aba147d364124eb967f62 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -26,7 +26,6 @@
 #include <getopt.h>
 #include "cp.h"
 #include "backupfile.h"
-#include "version.h"
 #include "argmatch.h"
 
 #ifndef _POSIX_VERSION
@@ -324,7 +323,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cp - %s\n", version_string);
+      printf ("cp - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/dd.c b/src/dd.c
index 2c59bdaa2e8b1f29b3dfa26de64b934ed46f5efe..df2d2dce4b2540efe8a9551e1d2beb9a27810a35 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -63,7 +63,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #define equal(p, q) (strcmp ((p),(q)) == 0)
@@ -340,7 +339,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("dd - %s\n", version_string);
+      printf ("dd - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/df.c b/src/df.c
index 55d2b59059f412c66648ca45468f6fca86485660..12aca2ffb0a57c4bc2b0b9745203669fbf95e707 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -27,7 +27,6 @@
 #include "mountlist.h"
 #include "fsusage.h"
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -231,7 +230,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("df - %s\n", version_string);
+      printf ("df - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/du.c b/src/du.c
index 8b586a009f4166e4e528e5b563986873f8e5cd78..a4c58a6c17a9c5dde51ded7119d724b38fed5b2c 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -51,7 +51,6 @@
 #include <assert.h>
 
 #include "system.h"
-#include "version.h"
 #include "save-cwd.h"
 #include "error.h"
 
@@ -335,7 +334,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("du - %s\n", version_string);
+      printf ("du - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/install.c b/src/install.c
index c25e30d5e48efa69e35923438315d848f40ab2d9..39584840b12d79fde7d7bf2d6a98a20f5563bb73 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -60,7 +60,6 @@
 #include <grp.h>
 
 #include "system.h"
-#include "version.h"
 #include "backupfile.h"
 #include "modechange.h"
 #include "makepath.h"
@@ -222,7 +221,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("install - %s\n", version_string);
+      printf ("install - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/ln.c b/src/ln.c
index 83866a3f81adb5c2d0a0426fd66301bf697b05c9..d60e369d98acb2b43d7f161a74a339958c384b27 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -28,7 +28,6 @@
 
 #include "system.h"
 #include "backupfile.h"
-#include "version.h"
 #include "error.h"
 
 int link ();                   /* Some systems don't declare this anywhere. */
@@ -371,7 +370,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("ln - %s\n", version_string);
+      printf ("ln - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/ls.c b/src/ls.c
index 5b92a2bfb8da634aa1835bbc0a8e8efe6e11089c..8f9fc3c6ca01e5c51d30070ac7528ba81084aabf 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -60,7 +60,6 @@
 
 #include "obstack.h"
 #include "ls.h"
-#include "version.h"
 #include "error.h"
 #include "argmatch.h"
 
@@ -639,7 +638,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("ls - %s\n", version_string);
+      printf ("ls - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/mkdir.c b/src/mkdir.c
index f5364f5c69e86c8b8147454e1640c55d268e1210..16455c1338a1427521c914c9c07b9e7453df5df0 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -35,7 +35,6 @@
 #include "system.h"
 #include "modechange.h"
 #include "makepath.h"
-#include "version.h"
 #include "error.h"
 
 /* The name this program was run with. */
@@ -116,7 +115,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mkdir - %s\n", version_string);
+      printf ("mkdir - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/mkfifo.c b/src/mkfifo.c
index 89cbf1c90eb52506df760c712f1a77c5a1dd05c1..ff5f40b7a5ac95c27b53433119f4cfc7aff14588 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -29,7 +29,6 @@
 
 #include "system.h"
 #include "modechange.h"
-#include "version.h"
 #include "error.h"
 
 /* The name this program was run with. */
@@ -105,7 +104,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mkfifo - %s\n", version_string);
+      printf ("mkfifo - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/mknod.c b/src/mknod.c
index 15eed96c709f234c53f29db94d894ed6a5667779..4850cecb3cf3f287094e6e4bbbd01465083d2447 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -34,7 +34,6 @@
 
 #include "system.h"
 #include "modechange.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -114,7 +113,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mknod - %s\n", version_string);
+      printf ("mknod - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/mv.c b/src/mv.c
index 7db230302d50238d3a8c93f0c33b725f1b538a62..65c5b48ed6db0fe3560c96ad6edcde6a7b45e96f 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -48,7 +48,6 @@
 
 #include "system.h"
 #include "backupfile.h"
-#include "version.h"
 #include "error.h"
 
 #ifndef _POSIX_VERSION
@@ -459,7 +458,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("mv - %s\n", version_string);
+      printf ("mv - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/rm.c b/src/rm.c
index e318d8d4c83ae02c4892095c731a87d5223a0410..3244c4927616020c2e323852478559bba51cc8f2 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #ifdef D_INO_IN_DIRENT
@@ -158,7 +157,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("rm - %s\n", version_string);
+      printf ("rm - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/rmdir.c b/src/rmdir.c
index e091fd063b0021adab1a0ab50a98a0d786d36d08..a23c166c8de136c5db734a7f2892b17625b4b655 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 void strip_trailing_slashes ();
@@ -124,7 +123,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("rmdir - %s\n", version_string);
+      printf ("rmdir - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/sync.c b/src/sync.c
index 497fb69555683669aca54bb342f7c775cdbc3c61..de0cd6d5d9cb53ca0eaf7e72fc24ec64c6474595 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -23,7 +23,6 @@
 
 #include "system.h"
 #include "long-options.h"
-#include "version.h"
 #include "error.h"
 
 /* The name this program was run with. */
@@ -56,7 +55,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "sync", version_string, usage);
+  parse_long_options (argc, argv, "sync", PACKAGE_VERSION, usage);
 
   if (argc != 1)
     error (0, 0, _("ignoring all arguments"));

diff --git a/src/touch.c b/src/touch.c
index 0f547ce1bbb65da0c6a767353bf76108a0da912a..53d1c32f76cc678c5ee5c6da998fb08175168095 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -38,7 +38,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "argmatch.h"
 
@@ -342,7 +341,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("touch - %s\n", version_string);
+      printf ("touch - %s\n", PACKAGE_VERSION);
       exit (0);
     }