[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
GNU_PACKAGE vs. PACKAGE_NAME
|
From: |
Eric Blake-1 |
|
Subject: |
GNU_PACKAGE vs. PACKAGE_NAME |
|
Date: |
Thu, 30 Aug 2007 07:29:54 -0700 (PDT) |
This reduces the size of configure and the generated
config.h a bit, by using autoconf's PACKAGE_NAME
rather than a hand-rolled GNU_PACKAGE expanding to
the same string.
I did not alter whether the package name should be
"GNU coreutils" (the current name) or "GNU Coreutils"
(more in line with other GNU packages, to capitalize
the package name). It is a one-line change to
configure.ac AC_INIT, but I wasn't sure whether the
testsuite would be impacted by it.
Also, I think it is worth considering a testsuite addition
to ensure the equivalent of:
diff <(id --version | sed '/^$/q') \
<(groups --version | sed 's/^groups/id/; /^$/q')
succeeds, but did not do it in this patch.
There are a number of other things that can be
trimmed out of configure.ac and its helper input
files, either because they are obsolete according to
autoconf, or because they are already picked up by
gnulib, but I stopped here before making the patch
too big to review.
>From 2ce8ffddab4f07143dacdd0aa6d58d35ba56ab82 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 30 Aug 2007 08:04:11 -0600
Subject: [PATCH] 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.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 36 ++++++++++++++++++++++++++++++++++++
configure.ac | 3 ---
m4/ChangeLog | 6 +++++-
m4/jm-macros.m4 | 5 -----
src/Makefile.am | 4 ++--
src/basename.c | 4 ++--
src/chroot.c | 4 ++--
src/dirname.c | 4 ++--
src/echo.c | 5 +++--
src/expr.c | 2 +-
src/factor.c | 4 ++--
src/groups.sh | 6 +++---
src/hostid.c | 4 ++--
src/hostname.c | 4 ++--
src/link.c | 4 ++--
src/logname.c | 4 ++--
src/nice.c | 4 ++--
src/nohup.c | 4 ++--
src/printenv.c | 4 ++--
src/printf.c | 2 +-
src/pwd.c | 4 ++--
src/setuidgid.c | 2 +-
src/sleep.c | 4 ++--
src/system.h | 2 +-
src/test.c | 2 +-
src/true.c | 4 ++--
src/unlink.c | 4 ++--
src/uptime.c | 4 ++--
src/users.c | 4 ++--
src/whoami.c | 4 ++--
src/yes.c | 4 ++--
31 files changed, 92 insertions(+), 59 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ac46eaf..1b2bf68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2007-08-30 Eric Blake <address@hidden>
+
+ 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 <address@hidden>
Ensure that TMPDIR is valid. Otherwise, it would cause test failures.
diff --git a/configure.ac b/configure.ac
index 0e49370..33088e8 100644
--- 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 8b350df..6829ab1 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-30 Eric Blake <address@hidden>
+
+ * jm-macros.m4 (coreutils_MACROS): Remove GNU_PACKAGE.
+
2007-04-25 Jim Meyering <address@hidden>
* autobuild.m4: Remove file. Now, provided by gnulib.
@@ -553,7 +557,7 @@
Apply this change from gnulib:
2006-05-30 Ralf Wildenhues <address@hidden>
- Bruno Haible <address@hidden>
+ Bruno Haible <address@hidden>
* 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 c821c09..416cc9c 100644
--- 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 6d652a6..607070e 100644
--- 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)/' $< > address@hidden
chmod +x address@hidden
@@ -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 50d6b12..f26de8d 100644
--- 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 4d23fab..90b0b96 100644
--- 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 2fc0b28..acd0003 100644
--- 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 55cefc8..f4e91f7 100644
--- 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 b11cd12..c800065 100644
--- 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 85dbefa..b54a170 100644
--- 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 0e578e3..54ae918 100755
--- 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 a5979d4..ea50086 100644
--- 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 3b9b423..4be2185 100644
--- 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 59215f3..4c576e1 100644
--- 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 932465a..7e85b5a 100644
--- 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 7892fea..79e7708 100644
--- 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 8080bf3..2753164 100644
--- 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 1f20f9d..69384ce 100644
--- 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 90cd200..7f87f3f 100644
--- 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 72e1d9a..28df3e6 100644
--- 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 7380346..7e0109a 100644
--- 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 a9dc22d..a5ba3bc 100644
--- 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 d840ed5..88765e0 100644
--- 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 c0d8938..daaf250 100644
--- 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 788cd49..4ce3fe6 100644
--- 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 6aad663..15a04a0 100644
--- 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 bb474c1..aff1e3d 100644
--- 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 73d6df5..7529886 100644
--- 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 4f9f33b..0e3a97d 100644
--- 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 079ba83..b789293 100644
--- 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);
--
1.5.2.2
--
View this message in context:
http://www.nabble.com/GNU_PACKAGE-vs.-PACKAGE_NAME-tf4354637.html#a12408482
Sent from the Gnu - Coreutils - Discuss mailing list archive at Nabble.com.
- GNU_PACKAGE vs. PACKAGE_NAME,
Eric Blake-1 <=
Re: GNU_PACKAGE vs. PACKAGE_NAME, Jim Meyering, 2007/08/30