From ca0246a4c13e8414a35263997b8a7b71ca28b71d Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 16 Mar 1996 16:49:28 +0000
Subject: [PATCH] Don't include version.h. (main): Use PACKAGE_VERSION instead
 of version_string.

---
 src/chgrp.c   | 3 +--
 src/chmod.c   | 3 +--
 src/chown.c   | 3 +--
 src/cp.c      | 3 +--
 src/dd.c      | 3 +--
 src/df.c      | 3 +--
 src/du.c      | 3 +--
 src/install.c | 3 +--
 src/ln.c      | 3 +--
 src/ls.c      | 3 +--
 src/mkdir.c   | 3 +--
 src/mkfifo.c  | 3 +--
 src/mknod.c   | 3 +--
 src/mv.c      | 3 +--
 src/rm.c      | 3 +--
 src/rmdir.c   | 3 +--
 src/sync.c    | 3 +--
 src/touch.c   | 3 +--
 18 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/chgrp.c b/src/chgrp.c
index 1f7b490..1c87fd4 100644
--- 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 2951071..2c8da0a 100644
--- 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 026309d..227e408 100644
--- 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 692a067..3000aa6 100644
--- 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 2c59bda..df2d2dc 100644
--- 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 55d2b59..12aca2f 100644
--- 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 8b586a0..a4c58a6 100644
--- 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 c25e30d..3958484 100644
--- 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 83866a3..d60e369 100644
--- 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 5b92a2b..8f9fc3c 100644
--- 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 f5364f5..16455c1 100644
--- 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 89cbf1c..ff5f40b 100644
--- 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 15eed96..4850cec 100644
--- 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 7db2303..65c5b48 100644
--- 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 e318d8d..3244c49 100644
--- 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 e091fd0..a23c166 100644
--- 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 497fb69..de0cd6d 100644
--- 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 0f547ce..53d1c32 100644
--- 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);
     }
 
-- 
2.7.4