Use PACKAGE_NAME instead of GNU_PACKAGE.

* src/Makefile.am (.sh, uninstall-local): Adjust all users of
hand-rolled GNU_PACKAGE to instead use autoconf-provided
PACKAGE_NAME.
* src/basename.c (main): Likewise.
* src/chroot.c (main): Likewise.
* src/dirname.c (main): Likewise.
* src/echo.c (main): Likewise.
* src/expr.c (main): Likewise.
* src/factor.c (main): Likewise.
* src/groups.sh (version): Likewise.  Also, reflect change in
--version output due to GPLv3.
* src/hostid.c (main): Likewise.
* src/hostname.c (main): Likewise.
* src/link.c (main): Likewise.
* src/logname.c (main): Likewise.
* src/nice.c (main): Likewise.
* src/nohup.c (main): Likewise.
* src/printenv.c (main): Likewise.
* src/printf.c (main): Likewise.
* src/pwd.c (main): Likewise.
* src/setuidgid.c (main): Likewise.
* src/sleep.c (main): Likewise.
* src/system.h (case_GETOPT_VERSION_CHAR): Likewise.
* src/test.c (main): Likewise.
* src/true.c (main): Likewise.
* src/unlink.c (main): Likewise.
* src/uptime.c (main): Likewise.
* src/users.c (main): Likewise.
* src/whoami.c (main): Likewise.
* src/yes.c (main): Likewise.
* configure.ac (AC_CHECK_DECLS): No need to check strtoimax,
strtoumax, since gnulib does this.

diff --git a/ChangeLog b/ChangeLog
index ac46eaf492c8e8914f4da02828c2c9d55dd4194d..1b2bf68034abefd1d2597d818bd316aa78cd3d44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2007-08-30  Eric Blake  <ebb9@byu.net>
+
+       Use PACKAGE_NAME instead of GNU_PACKAGE.
+       * src/Makefile.am (.sh, uninstall-local): Adjust all users of
+       hand-rolled GNU_PACKAGE to instead use autoconf-provided
+       PACKAGE_NAME.
+       * src/basename.c (main): Likewise.
+       * src/chroot.c (main): Likewise.
+       * src/dirname.c (main): Likewise.
+       * src/echo.c (main): Likewise.
+       * src/expr.c (main): Likewise.
+       * src/factor.c (main): Likewise.
+       * src/groups.sh (version): Likewise.  Also, reflect change in
+       --version output due to GPLv3.
+       * src/hostid.c (main): Likewise.
+       * src/hostname.c (main): Likewise.
+       * src/link.c (main): Likewise.
+       * src/logname.c (main): Likewise.
+       * src/nice.c (main): Likewise.
+       * src/nohup.c (main): Likewise.
+       * src/printenv.c (main): Likewise.
+       * src/printf.c (main): Likewise.
+       * src/pwd.c (main): Likewise.
+       * src/setuidgid.c (main): Likewise.
+       * src/sleep.c (main): Likewise.
+       * src/system.h (case_GETOPT_VERSION_CHAR): Likewise.
+       * src/test.c (main): Likewise.
+       * src/true.c (main): Likewise.
+       * src/unlink.c (main): Likewise.
+       * src/uptime.c (main): Likewise.
+       * src/users.c (main): Likewise.
+       * src/whoami.c (main): Likewise.
+       * src/yes.c (main): Likewise.
+       * configure.ac (AC_CHECK_DECLS): No need to check strtoimax,
+       strtoumax, since gnulib does this.
+
 2007-08-29  Jim Meyering  <jim@meyering.net>
 
        Ensure that TMPDIR is valid.  Otherwise, it would cause test failures.

diff --git a/configure.ac b/configure.ac
index 0e49370de6845840681dfd129b631dce351102bf..33088e84eb51a1c81a1db546ebfa79eabc24538a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -237,9 +237,6 @@ AC_CHECK_DECLS([strsignal, sys_siglist, _sys_siglist, __sys_siglist], , ,
   [AC_INCLUDES_DEFAULT
 #include <signal.h>])
 
-# For src/kill.c and src/printf.c.
-AC_CHECK_DECLS([strtoimax, strtoumax])
-
 cu_LIB_CHECK
 
 # Build df only if there's a point to it.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 8b350dfec239f9ddd79d198c3b31eed5e72f61a4..6829ab166085efb30cf6644346f0f91c584b41ec 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-30  Eric Blake  <ebb9@byu.net>
+
+       * jm-macros.m4 (coreutils_MACROS): Remove GNU_PACKAGE.
+
 2007-04-25  Jim Meyering  <jim@meyering.net>
 
        * autobuild.m4: Remove file.  Now, provided by gnulib.
@@ -553,7 +557,7 @@
        Apply this change from gnulib:
 
        2006-05-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-                   Bruno Haible  <bruno@clisp.org>
+                   Bruno Haible  <bruno@clisp.org>
 
        * strndup.m4 (gl_FUNC_STRNDUP): Replace the AC_REPLACE_FUNCS with a
        check for the declaration of strnlen and a run test that exposes the

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index c821c099430c08f2ad8ef9aa376bc7653afe259e..416cc9c2bb4fd1991858880beba00b7f0ad89549 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -21,11 +21,6 @@ dnl Misc type-related macros for coreutils.
 
 AC_DEFUN([coreutils_MACROS],
 [
-  GNU_PACKAGE="GNU $PACKAGE"
-  AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
-    [The concatenation of the strings `GNU ', and PACKAGE.])
-  AC_SUBST(GNU_PACKAGE)
-
   AM_MISSING_PROG(HELP2MAN, help2man)
   AC_SUBST(MAN)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 6d652a6665c2a74fb4c447ab9efad76c9c8b9747..607070eef006649da22c8ed4a70f2d69c2685cf3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -147,7 +147,7 @@ RELEASE_YEAR = \
        sed \
          -e 's!@''bindir''@!$(bindir)!' \
          -e 's/@''RELEASE_YEAR'@/$(RELEASE_YEAR)/ \
-         -e 's/@''GNU_PACKAGE''@/$(GNU_PACKAGE)/' \
+         -e 's/@''PACKAGE_NAME''@/$(PACKAGE_NAME)/' \
          -e 's/@''PACKAGE_BUGREPORT''@/$(PACKAGE_BUGREPORT)/' \
          -e 's/@''VERSION''@/$(VERSION)/' $< > $@-t
        chmod +x $@-t
@@ -195,7 +195,7 @@ install-exec-local: su$(EXEEXT)
 
 uninstall-local:
 # Remove su only if it's one we installed.
-       @if grep '$(GNU_PACKAGE)' $(installed_su) > /dev/null 2>&1; then \
+       @if grep '$(PACKAGE_NAME)' $(installed_su) > /dev/null 2>&1; then \
          echo "  rm -f $(installed_su)"; \
          rm -f $(installed_su); \
        else :; fi

diff --git a/src/basename.c b/src/basename.c
index 50d6b120af178bafd8a53d6b839d102f4575221f..f26de8d10fd3e070263dcdc9dfe458ee6a595fcc 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -1,5 +1,5 @@
 /* basename -- strip directory and suffix from file names
-   Copyright (C) 1990-1997, 1999-2006 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1999-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/chroot.c b/src/chroot.c
index 4d23fabccbcaab1a876e23ec1279795df7f2b63d..90b0b967b01bcf6ef86676088bbcff554125c35f 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -1,5 +1,5 @@
 /* chroot -- run command or shell with special root directory
-   Copyright (C) 95, 96, 1997, 1999-2004 Free Software Foundation, Inc.
+   Copyright (C) 95, 96, 1997, 1999-2004, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@ main (int argc, char **argv)
   initialize_exit_failure (EXIT_FAILURE);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/dirname.c b/src/dirname.c
index 2fc0b285cc37d5b8255140df2cf01bcfa9bd208b..acd00033cde2d93335d895edad289c0350d23de4 100644 (file)
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -1,6 +1,6 @@
 /* dirname -- strip suffix from file name
 
-   Copyright (C) 1990-1997, 1999-2002, 2004, 2005, 2006 Free Software
+   Copyright (C) 1990-1997, 1999-2002, 2004-2007 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -83,7 +83,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/echo.c b/src/echo.c
index 55cefc86234fed6f9d7efa3196f0d83a904ac3a7..f4e91f7dab0a1d657fc283145423c5029dbd79e3 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -1,5 +1,6 @@
 /* echo.c, derived from code echo.c in Bash.
-   Copyright (C) 87,89, 1991-1997, 1999-2005 Free Software Foundation, Inc.
+   Copyright (C) 87,89, 1991-1997, 1999-2005, 2007 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -141,7 +142,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   if (allow_options)
-    parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+    parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                        usage, AUTHORS, (char const *) NULL);
 
   --argc;

diff --git a/src/expr.c b/src/expr.c
index b11cd12a8f57a96b58d036739c2e43bf43c907ea..c800065c62dfc9f0c8a9118e9780bfdffa2d481f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -194,7 +194,7 @@ main (int argc, char **argv)
   initialize_exit_failure (EXPR_FAILURE);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/factor.c b/src/factor.c
index 85dbefa08a85551a670cb90eb7cff17ccd071263..b54a17095445f1cf603abcf703f1f758b420f7ca 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -1,5 +1,5 @@
 /* factor -- print prime factors of n.
-   Copyright (C) 86, 1995-2005 Free Software Foundation, Inc.
+   Copyright (C) 86, 1995-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -199,7 +199,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/groups.sh b/src/groups.sh
index 0e578e3ab5691484de550aae13b8364070a19795..54ae918c7bfefc20847f696bde6f94d04fd4aacf 100755 (executable)
--- a/src/groups.sh
+++ b/src/groups.sh
@@ -30,10 +30,10 @@ Same as id -Gn.  If no USERNAME, use current process.
 
 Report bugs to <@PACKAGE_BUGREPORT@>."
 
-version='groups (@GNU_PACKAGE@) @VERSION@
+version='groups (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by David MacKenzie.'

diff --git a/src/hostid.c b/src/hostid.c
index a5979d42eda9cd7ce6b5278452a93b2415de8402..ea50086eb0b759b27756030115ec57eced70935f 100644 (file)
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -1,6 +1,6 @@
 /* print the hexadecimal identifier for the current host
 
-   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 Free
+   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2007 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -71,7 +71,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/hostname.c b/src/hostname.c
index 3b9b42336aa3a27203bde2d0bfae3ae4b50c6af1..4be2185c17f5593761905dfd6a9982caddc8bff7 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -1,5 +1,5 @@
 /* hostname - set or print the name of current host system
-   Copyright (C) 1994-1997, 1999-2005 Free Software Foundation, Inc.
+   Copyright (C) 1994-1997, 1999-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/link.c b/src/link.c
index 59215f378b0edcb92cbe105a85725d1b0b67f324..4c576e1cffd33be06e130a4a5dd3fbb0c571b00f 100644 (file)
--- a/src/link.c
+++ b/src/link.c
@@ -1,5 +1,5 @@
 /* link utility for GNU.
-   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/logname.c b/src/logname.c
index 932465a4b39a26d90d2654cc3b5e9eada1b7434a..7e85b5a669ef69f477dfd94024e1ea9f54f20edc 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -1,5 +1,5 @@
 /* logname -- print user's login name
-   Copyright (C) 1990-1997, 1999-2005 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1999-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/nice.c b/src/nice.c
index 7892fea4c8a9797b1034e42487e4b430a3bcb2ca..79e77085045f26616e29ad8dce698a79f8e7bc1a 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -1,5 +1,5 @@
 /* nice -- run a program with modified niceness
-   Copyright (C) 1990-2005 Free Software Foundation, Inc.
+   Copyright (C) 1990-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -107,7 +107,7 @@ main (int argc, char **argv)
   initialize_exit_failure (EXIT_FAILURE);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
 
   for (i = 1; i < argc; /* empty */)

diff --git a/src/nohup.c b/src/nohup.c
index 8080bf33a1f2ba14d6d2296117fd2e14380ca9dd..275316485bbdda69b4185dc00e7c3c53b3b8002b 100644 (file)
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -1,5 +1,5 @@
 /* nohup -- run a command immune to hangups, with output to a non-tty
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -97,7 +97,7 @@ main (int argc, char **argv)
   initialize_exit_failure (NOHUP_FAILURE);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (NOHUP_FAILURE);

diff --git a/src/printenv.c b/src/printenv.c
index 1f20f9de3148442ab62aad5fa34188f6db411d0f..69384ce2adf93577446f4f12af740a33ad555801 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -1,5 +1,5 @@
 /* printenv -- print all or part of environment
-   Copyright (C) 1989-1997, 1999-2005 Free Software Foundation, Inc.
+   Copyright (C) 1989-1997, 1999-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -89,7 +89,7 @@ main (int argc, char **argv)
   initialize_exit_failure (PRINTENV_FAILURE);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (PRINTENV_FAILURE);

diff --git a/src/printf.c b/src/printf.c
index 90cd20092f781724b3dd2feccbf243156d5fd037..7f87f3f65a04258713a60b92fecd334a6273f725 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -648,7 +648,7 @@ main (int argc, char **argv)
 
   posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
 
   /* The above handles --help and --version.

diff --git a/src/pwd.c b/src/pwd.c
index 72e1d9adf7e098009a853aa1cee0d723ebee76aa..28df3e6a7c273a9e40ff8cebc68a40d09eb8eb69 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -1,5 +1,5 @@
 /* pwd - print current directory
-   Copyright (C) 1994-1997, 1999-2006 Free Software Foundation, Inc.
+   Copyright (C) 1994-1997, 1999-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -296,7 +296,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/setuidgid.c b/src/setuidgid.c
index 73803460e134356576b031072403828b545eac0a..7e0109abaf80a554b1a0fc0aa37901a04c59cf52 100644 (file)
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
   initialize_exit_failure (SETUIDGID_FAILURE);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (SETUIDGID_FAILURE);

diff --git a/src/sleep.c b/src/sleep.c
index a9dc22d78ae6ccab74d7ead63317e670cc874902..a5ba3bc8f3b2a8c8ccb8975cdc30712e1db96695 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -1,5 +1,5 @@
 /* sleep - delay for a specified amount of time.
-   Copyright (C) 84, 1991-1997, 1999-2005 Free Software Foundation, Inc.
+   Copyright (C) 84, 1991-1997, 1999-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/system.h b/src/system.h
index d840ed505b3ed72451ec41b20f05d09a2fc6b6ba..88765e0f1716fd9495f498932f232acc0d373f8d 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -423,7 +423,7 @@ enum
 
 #define case_GETOPT_VERSION_CHAR(Program_name, Authors)                        \
   case GETOPT_VERSION_CHAR:                                            \
-    version_etc (stdout, Program_name, GNU_PACKAGE, VERSION, Authors,  \
+    version_etc (stdout, Program_name, PACKAGE_NAME, VERSION, Authors, \
                  (char *) NULL);                                       \
     exit (EXIT_SUCCESS);                                               \
     break;

diff --git a/src/test.c b/src/test.c
index c0d89387d48e2a47e8b22a81ae199b68e932e29f..daaf25012cba46ed197cd10af75df320834445ab 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -828,7 +828,7 @@ main (int margc, char **margv)
         to exit silently with status 0.  */
       if (margc < 2 || !STREQ (margv[margc - 1], "]"))
        {
-         parse_long_options (margc, margv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+         parse_long_options (margc, margv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                              usage, AUTHORS, (char const *) NULL);
          test_syntax_error (_("missing `]'"), NULL);
        }

diff --git a/src/true.c b/src/true.c
index 788cd4928fdd40acfce1eded669f762bcc4bc7ca..4ce3fe6cb248fc5899237a3e09a9f5391b4a4722 100644 (file)
--- a/src/true.c
+++ b/src/true.c
@@ -1,5 +1,5 @@
 /* Exit with a status code indicating success.
-   Copyright (C) 1999-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999-2003, 2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@ main (int argc, char **argv)
        usage (EXIT_STATUS);
 
       if (STREQ (argv[1], "--version"))
-       version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS,
+       version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, VERSION, AUTHORS,
                     (char *) NULL);
     }
 

diff --git a/src/unlink.c b/src/unlink.c
index 6aad6634a77427abee36914fb5a1de2ed78de3ba..15a04a03a39cca35cfac7907a49abb97c2881e49 100644 (file)
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -1,5 +1,5 @@
 /* unlink utility for GNU.
-   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/uptime.c b/src/uptime.c
index bb474c193cbc27ac1b8e810dcda605aae92a83cc..aff1e3dfa5479e137609da799b28c23b80fc977a 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -1,5 +1,5 @@
 /* GNU's uptime.
-   Copyright (C) 1992-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992-2002, 2004-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,7 +220,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/users.c b/src/users.c
index 73d6df5327401d1ef1a01d9993c4ae6f59f91403..75298863d3af92cdcb851251b22ab420c606b2fc 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -1,5 +1,5 @@
 /* GNU's users.
-   Copyright (C) 1992-2005 Free Software Foundation, Inc.
+   Copyright (C) 1992-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -129,7 +129,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/whoami.c b/src/whoami.c
index 4f9f33be2e9d2bd581c0748fda53b56059508964..0e3a97d59db01cb30d3e15dc8c442be03f5923aa 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -1,6 +1,6 @@
 /* whoami -- print effective userid
 
-   Copyright (C) 89,90, 1991-1997, 1999-2002, 2004, 2005 Free Software
+   Copyright (C) 89,90, 1991-1997, 1999-2002, 2004, 2005, 2007 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -73,7 +73,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
     usage (EXIT_FAILURE);

diff --git a/src/yes.c b/src/yes.c
index 079ba83a6c8ec8db92303d52c8a1dc70ab6f9ed7..b7892935089fad342d0e8460dfb8ffe27a6bf3ae 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -1,5 +1,5 @@
 /* yes - output a string repeatedly until killed
-   Copyright (C) 1991-1997, 1999-2004 Free Software Foundation, Inc.
+   Copyright (C) 1991-1997, 1999-2004, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, VERSION,
                      usage, AUTHORS, (char const *) NULL);
   if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
     usage (EXIT_FAILURE);