From 4229a555fc6298ac0cbc6f76faf4eaea628bc80c Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 16 Mar 1996 22:30:54 +0000
Subject: Don't include version.h. (main): Use PACKAGE_VERSION instead of
 version_string.

---
 src/cat.c      | 3 +--
 src/cksum.c    | 3 +--
 src/comm.c     | 3 +--
 src/csplit.c   | 3 +--
 src/cut.c      | 3 +--
 src/expand.c   | 3 +--
 src/fmt.c      | 3 +--
 src/fold.c     | 3 +--
 src/head.c     | 3 +--
 src/join.c     | 3 +--
 src/md5sum.c   | 5 ++---
 src/nl.c       | 3 +--
 src/od.c       | 3 +--
 src/paste.c    | 3 +--
 src/pr.c       | 3 +--
 src/sort.c     | 3 +--
 src/split.c    | 3 +--
 src/sum.c      | 3 +--
 src/tac.c      | 3 +--
 src/tail.c     | 3 +--
 src/tr.c       | 3 +--
 src/unexpand.c | 3 +--
 src/uniq.c     | 3 +--
 src/wc.c       | 3 +--
 24 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/src/cat.c b/src/cat.c
index 31eada9d7..390abc4f9 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -31,7 +31,6 @@
 #include <sys/ioctl.h>
 #endif
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
@@ -580,7 +579,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cat - %s\n", version_string);
+      printf ("cat - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/cksum.c b/src/cksum.c
index c3f3a8119..d5b29ef96 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -108,7 +108,6 @@ main ()
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Number of bytes to read at once.  */
@@ -307,7 +306,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cksum - %s\n", version_string);
+      printf ("cksum - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/comm.c b/src/comm.c
index e9db88874..a1b1f4622 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include "system.h"
 #include "linebuffer.h"
-#include "version.h"
 #include "error.h"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
@@ -250,7 +249,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("comm - %s\n", version_string);
+      printf ("comm - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/csplit.c b/src/csplit.c
index 508eadc77..5045c7cb8 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -42,7 +42,6 @@
 # include <rx.h>
 #endif
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtoul.h"
 
@@ -1490,7 +1489,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("csplit - %s\n", version_string);
+      printf ("csplit - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/cut.c b/src/cut.c
index d50ec71c9..a6ecdab39 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -72,7 +72,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #define FATAL_ERROR(s)							\
@@ -737,7 +736,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cut - %s\n", version_string);
+      printf ("cut - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/expand.c b/src/expand.c
index 93ddee476..d77d1c8fa 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -42,7 +42,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* The number of bytes added at a time to the amount of memory
@@ -368,7 +367,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("expand - %s\n", version_string);
+      printf ("expand - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/fmt.c b/src/fmt.c
index faf975bc7..dc03b7aa2 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -40,7 +40,6 @@
 #define word unused_word_type
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -398,7 +397,7 @@ main (register int argc, register char **argv)
 
   if (show_version)
     {
-      printf ("fmt - %s\n", version_string);
+      printf ("fmt - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/fold.c b/src/fold.c
index a23b637c8..747f78684 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -39,7 +39,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "xstrtol.h"
 #include "error.h"
 
@@ -309,7 +308,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("fold - %s\n", version_string);
+      printf ("fold - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/head.c b/src/head.c
index a0415801e..244d9a813 100644
--- a/src/head.c
+++ b/src/head.c
@@ -30,7 +30,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Number of lines/chars/blocks to head. */
@@ -353,7 +352,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("head - %s\n", version_string);
+      printf ("head - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/join.c b/src/join.c
index e9c5bb145..360684a65 100644
--- a/src/join.c
+++ b/src/join.c
@@ -61,7 +61,6 @@ char *alloca ();
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "xstrtol.h"
 #include "error.h"
@@ -782,7 +781,7 @@ main (int argc, char **argv)
      it may be increased.  */
   uni_blank.nfields = 1;
 
-  parse_long_options (argc, argv, "join", version_string, usage);
+  parse_long_options (argc, argv, "join", PACKAGE_VERSION, usage);
 
   nfiles = 0;
   print_pairables = 1;
diff --git a/src/md5sum.c b/src/md5sum.c
index 2e2759d0f..07ad35488 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -31,7 +31,6 @@
 #include "getline.h"
 #include "system.h"
 #include "error.h"
-#include "version.h"
 
 /* Most systems do not distinguish between external and internal
    text representations.  */
@@ -403,7 +402,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "md5sum", version_string, usage);
+  parse_long_options (argc, argv, "md5sum", PACKAGE_VERSION, usage);
 
   while ((opt = getopt_long (argc, argv, "bctw", long_options, NULL))
 	 != EOF)
@@ -444,7 +443,7 @@ main (int argc, char **argv)
 
   if (do_version)
     {
-      printf ("md5sum - %s\n", version_string);
+      printf ("md5sum - %s\n", PACKAGE_VERSION);
       exit (EXIT_SUCCESS);
     }
 
diff --git a/src/nl.c b/src/nl.c
index 0ac34979c..0450bda6a 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -44,7 +44,6 @@
 
 #include "linebuffer.h"
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -578,7 +577,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("nl - %s\n", version_string);
+      printf ("nl - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/od.c b/src/od.c
index 8cca7b9b8..fb3303900 100644
--- a/src/od.c
+++ b/src/od.c
@@ -44,7 +44,6 @@ char *alloca ();
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "xstrtoul.h"
 #include "error.h"
 
@@ -1758,7 +1757,7 @@ the maximum\nrepresentable value of type off_t"), optarg);
 
   if (show_version)
     {
-      printf ("od - %s\n", version_string);
+      printf ("od - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/paste.c b/src/paste.c
index 395c6bcaf..7ac478731 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -44,7 +44,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -473,7 +472,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("paste - %s\n", version_string);
+      printf ("paste - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/pr.c b/src/pr.c
index be9356dae..954876e7a 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -101,7 +101,6 @@
 #include <sys/types.h>
 #include <time.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -617,7 +616,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("pr - %s\n", version_string);
+      printf ("pr - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/sort.c b/src/sort.c
index 8e2723298..c1c6dc5ef 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -28,7 +28,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 #include "xstrtod.h"
@@ -1678,7 +1677,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "sort", version_string, usage);
+  parse_long_options (argc, argv, "sort", PACKAGE_VERSION, usage);
 
   have_read_stdin = 0;
   inittables ();
diff --git a/src/split.c b/src/split.c
index bdc89e551..fb6ec4e50 100644
--- a/src/split.c
+++ b/src/split.c
@@ -40,7 +40,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -454,7 +453,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("split - %s\n", version_string);
+      printf ("split - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/sum.c b/src/sum.c
index df22ff897..bf04e6233 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 int safe_read ();
@@ -235,7 +234,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("sum - %s\n", version_string);
+      printf ("sum - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/tac.c b/src/tac.c
index 54c10d0b4..88c688a74 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -47,7 +47,6 @@ tac -r -s '.\|
 # include <rx.h>
 #endif
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #ifndef STDC_HEADERS
@@ -622,7 +621,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tac - %s\n", version_string);
+      printf ("tac - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/tail.c b/src/tail.c
index c4c80caf3..5ec27fce3 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -51,7 +51,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "xstrtol.h"
 #include "error.h"
 
@@ -970,7 +969,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tail - %s\n", version_string);
+      printf ("tail - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/tr.c b/src/tr.c
index 2a97d8157..d00860777 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -34,7 +34,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #ifndef ULONG_MAX
@@ -1832,7 +1831,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tr - %s\n", version_string);
+      printf ("tr - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/unexpand.c b/src/unexpand.c
index 0d0959474..dddd57761 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -44,7 +44,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* The number of bytes added at a time to the amount of memory
@@ -425,7 +424,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("unexpand - %s\n", version_string);
+      printf ("unexpand - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/uniq.c b/src/uniq.c
index d6900ceff..2ba1aa403 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -40,7 +40,6 @@
 
 #include "system.h"
 #include "linebuffer.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -363,7 +362,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("uniq - %s\n", version_string);
+      printf ("uniq - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/wc.c b/src/wc.c
index 27db2a436..10875887a 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Size of atomic reads. */
@@ -293,7 +292,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("wc - %s\n", version_string);
+      printf ("wc - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
-- 
cgit v1.2.3-54-g00ecf