Don't include version.h.

(main): Use PACKAGE_VERSION instead of version_string.

diff --git a/src/basename.c b/src/basename.c
index 9a9ca0cbd15d97091223b04f78146cd895aad4f9..1a63ef0ea809660e2c42f22e354fd88330374795 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -93,7 +92,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "basename", version_string, usage);
+  parse_long_options (argc, argv, "basename", PACKAGE_VERSION, usage);
 
   if (argc == 1 || argc > 3)
     {

diff --git a/src/date.c b/src/date.c
index 7b0c456c3e7cac77d745661cd5709b341fe158da..0f7d3522064a1791374bac053a546d1c7916576f 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -22,7 +22,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 
-#include "version.h"
 #include "system.h"
 #include "getline.h"
 #include "error.h"
@@ -199,7 +198,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("date - %s\n", version_string);
+      printf ("date - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/dirname.c b/src/dirname.c
index 82eca22296dd3cfd8d68a7aa1ab21ed88a575558..86d943eaaa8fce22eef0d582593cf1468e3d9d72 100644 (file)
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -66,7 +65,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "dirname", version_string, usage);
+  parse_long_options (argc, argv, "dirname", PACKAGE_VERSION, usage);
 
   if (argc != 2)
     {

diff --git a/src/echo.c b/src/echo.c
index 3f31a444bd7b64dd2336e1b21343ced0efe198a1..5b2064cf486b1dda414dff9cfb5b60056ad2adf9 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -21,7 +21,6 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 
 /* echo [-neE] [arg ...]
@@ -111,7 +110,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "echo", version_string, usage);
+  parse_long_options (argc, argv, "echo", PACKAGE_VERSION, usage);
 
 /* System V machines already have a /bin/sh with a v9 behaviour.  We
    use the identical behaviour for these machines so that the

diff --git a/src/env.c b/src/env.c
index 24ad743de750e82fbc684b6a54bf35890a9c8023..2f5534d3151f783ecb798b9e1d7f84c2291283bf 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -83,7 +83,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -141,7 +140,7 @@ main (register int argc, register char **argv, char **envp)
 
   if (show_version)
     {
-      printf ("env - %s\n", version_string);
+      printf ("env - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/expr.c b/src/expr.c
index 3376a6dfd2b16f85e474d1b0dc3853b4367bfbdc..4fc074910dc97a82e74b5eaf5f80cc5ab540eccc 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -34,7 +34,6 @@
 #include <regex.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -159,7 +158,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "expr", version_string, usage);
+  parse_long_options (argc, argv, "expr", PACKAGE_VERSION, usage);
 
   if (argc == 1)
     {

diff --git a/src/factor.c b/src/factor.c
index 11251244c5d3103eca259a61c8e8ac83a70c1f8e..0706dff69d892e970a82c7829b509d22f1ba32a3 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -39,7 +39,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 #include "xstrtoul.h"
@@ -178,7 +177,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "factor", version_string, usage);
+  parse_long_options (argc, argv, "factor", PACKAGE_VERSION, usage);
 
   fail = 0;
   if (argc == 1)

diff --git a/src/hostname.c b/src/hostname.c
index 239dba08ca34ce66124e1ba2162317f0c3c9e2c2..83d72279eed24c7d4750dddea4c97d9591cc0986 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -83,7 +82,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "hostname", version_string, usage);
+  parse_long_options (argc, argv, "hostname", PACKAGE_VERSION, usage);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)

diff --git a/src/id.c b/src/id.c
index a03ba6e6898b73e82c840de8bd1a7e6974c86a48..d85a620c193bca8e6f5cea20d8d21d7b718d0c61 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -26,7 +26,6 @@
 #include <grp.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -134,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("id - %s\n", version_string);
+      printf ("id - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/logname.c b/src/logname.c
index 9d71c751e79e61f4db73c98fae1dc96020013749..82e5735e382c066d7997a64f128dd3fb14c571ed 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 
 /* The name this program was run with. */
@@ -83,7 +82,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("logname - %s\n", version_string);
+      printf ("logname - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/nice.c b/src/nice.c
index 579a206befd8cb66f22f82de3a6f133714e0b1cb..c4f5b0a60947444f773c622300792946075275fe 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -30,7 +30,6 @@
 #include <sys/resource.h>
 #endif
 
-#include "version.h"
 #include "system.h"
 #include "long-options.h"
 #include "error.h"
@@ -68,7 +67,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "nice", version_string, usage);
+  parse_long_options (argc, argv, "nice", PACKAGE_VERSION, usage);
 
   for (optind = 1; optind < argc; /* empty */)
     {

diff --git a/src/pathchk.c b/src/pathchk.c
index ddb44ef240b7ac37ec2efcd1577ac74108a1385e..224d517c3b13c6b28aa37787f64340ff2d6d55d7 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -43,7 +43,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -143,7 +142,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("pathchk - %s\n", version_string);
+      printf ("pathchk - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/printenv.c b/src/printenv.c
index 6bc45c1fa52f41c57d917e1e5665f7b5fcfef038..fbdca726d87507fe30e2e20b6931e63ecf718a99 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -101,7 +100,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("printenv - %s\n", version_string);
+      printf ("printenv - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/printf.c b/src/printf.c
index 7c5f338a96c56e351886c0278b3e4c3492007a47..d71a3047028bdba8ab9acfd07b94345de804a7be 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -49,7 +49,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -138,7 +137,7 @@ main (int argc, char **argv)
 
   exit_status = 0;
 
-  parse_long_options (argc, argv, "printf", version_string, usage);
+  parse_long_options (argc, argv, "printf", PACKAGE_VERSION, usage);
 
   if (argc == 1)
     {

diff --git a/src/pwd.c b/src/pwd.c
index c61c19438a09ae4830d0e5f3e0abdae3e540d41f..6a4ab4496595d4469efe5bd4d75442c64588990c 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -60,7 +59,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "pwd", version_string, usage);
+  parse_long_options (argc, argv, "pwd", PACKAGE_VERSION, usage);
 
   if (argc != 1)
     error (0, 0, _("ignoring non-option arguments"));

diff --git a/src/seq.c b/src/seq.c
index cdfcd6da3600b4f77c0910620ce356ee4f3bc251..323f5d7c5a1e57056bd975df0c1b3299561faf8c 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "version.h"
 
 static double scan_double_arg __P ((char *arg));
 static int check_format __P ((char *format_string));
@@ -151,7 +150,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      (void) printf ("seq - %s\n", version_string);
+      (void) printf ("seq - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/sleep.c b/src/sleep.c
index b37e9439314987eaf1e761a4d55d3ad210f31aa2..e417ead9cbdc03f6cc4b699a5dd0629510f3458d 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -87,7 +86,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("sleep - %s\n", version_string);
+      printf ("sleep - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/stty.c b/src/stty.c
index e18e34bb33bf9a49d35f21b48902378e913d8ad2..c2cbc4ebf3157a1087dc7770c45e0aeb322888ad 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -48,7 +48,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 #include "xstrtol.h"
@@ -654,7 +653,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "stty", version_string, usage);
+  parse_long_options (argc, argv, "stty", PACKAGE_VERSION, usage);
 
   output_type = changed;
   verbose_output = 0;

diff --git a/src/su.c b/src/su.c
index 25168fc14d04fce5a870bc96fad9d9e384cf7b2a..81c9adba024c25e15b69bc1dde39627373935fc6 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -113,7 +113,6 @@ uid_t getuid ();
 #include <shadow.h>
 #endif
 
-#include "version.h"
 #include "error.h"
 
 /* The default PATH for simulated logins to non-superuser accounts.  */
@@ -239,7 +238,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("su - %s\n", version_string);
+      printf ("su - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/tee.c b/src/tee.c
index 95018ddb79b41805c5fabfc1767475c60859f7a9..2914638d84fb93630c50313e27c1a67a62b7e11b 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -114,7 +113,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tee - %s\n", version_string);
+      printf ("tee - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/test.c b/src/test.c
index face6a5b2fd658b1159d69bae4fe363a7201cc05..076bef71125697db9541d344bc05d8cf55cad371 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -36,7 +36,6 @@
 #  include "filecntl.h"
 #else /* TEST_STANDALONE */
 #  include "system.h"
-#  include "version.h"
 #  include "group-member.h"
 #  include "error.h"
 #  if !defined (S_IXUGO)
@@ -1074,7 +1073,7 @@ main (int margc, char **margv)
 
   if (margv[0] && strcmp (margv[0], "[") == 0)
     {
-      parse_long_options (argc, argv, COMMAND_NAME, version_string, usage);
+      parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
 
       --margc;
 
@@ -1091,7 +1090,7 @@ main (int margc, char **margv)
   if (pos >= argc)
     test_exit (SHELL_BOOLEAN (FALSE));
 
-  parse_long_options (argc, argv, COMMAND_NAME, version_string, usage);
+  parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
   value = posixtest ();
 
   if (pos != argc)

diff --git a/src/tty.c b/src/tty.c
index 26c293bb7b5826006090a62522dcccfd0dae2b4c..cc42023a2f4048c7a2a0f2521d934e3c31688a6d 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 static void usage __P ((int status));
@@ -85,7 +84,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tty - %s\n", version_string);
+      printf ("tty - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/uname.c b/src/uname.c
index e64af98ed4f3044bfbc9240a63775aa41a733cf5..a34ef65a3d7ded591292a31ef03a591654b97d4f 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -35,7 +35,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 static void print_element __P ((unsigned int mask, char *element));
@@ -134,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("uname - %s\n", version_string);
+      printf ("uname - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/who-users.c b/src/who-users.c
index 2313e4bb5c1eb1300e4b88de7b431e500a2160be..2418e3c3fa0131ce3b57b355c3f19edb4daa2a2c 100644 (file)
--- a/src/who-users.c
+++ b/src/who-users.c
@@ -51,7 +51,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #if !defined (UTMP_FILE) && defined (_PATH_UTMP)       /* 4.4BSD.  */
@@ -623,7 +622,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("%s - %s\n", COMMAND_NAME, version_string);
+      printf ("%s - %s\n", COMMAND_NAME, PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/whoami.c b/src/whoami.c
index 0bd3cdddecfc8629e894eae2d4a6ada71d3290f4..2e2c56819f4c5f0f5bf918a5b28e267b50c6c941 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -24,7 +24,6 @@
 #include <pwd.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 
 /* The name this program was run with. */
@@ -88,7 +87,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("whoami - %s\n", version_string);
+      printf ("whoami - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/yes.c b/src/yes.c
index 58a06d6a635b71ec3c52e890df063b136686e452..02ded1274749a8ed41cbed17f05f26255690aa0f 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -23,7 +23,6 @@
 
 #include "system.h"
 #include "long-options.h"
-#include "version.h"
 
 /* The name this program was run with. */
 char *program_name;
@@ -54,7 +53,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "yes", version_string, usage);
+  parse_long_options (argc, argv, "yes", PACKAGE_VERSION, usage);
 
   if (argc == 1)
     while (1)