diff options
| author | Jim Meyering <jim@meyering.net> | 2007-01-04 15:34:29 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-01-04 15:34:29 +0100 |
| commit | 11bcfcc72aafed790b7e262c98b864ff9d8ed706 (patch) | |
| tree | 41572cf47d13336514f539d042f9c8364f12c656 | |
| parent | aa6a5547b387edef8db12345b97af9c35d9571df (diff) | |
| download | coreutils-11bcfcc72aafed790b7e262c98b864ff9d8ed706.tar.xz | |
Use the release year, not the current year.
* src/groups.sh (version): Use a better name: @RELEASE_YEAR@.
* src/Makefile.am (RELEASE_YEAR): Define it.
(.sh): Use it.
Thanks to a prod from Eric Blake.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rwxr-xr-x | src/groups.sh | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2007-01-04 Jim Meyering <jim@meyering.net> + Use the release year, not the current year. + * src/groups.sh (version): Use a better name: @RELEASE_YEAR@. + * src/Makefile.am (RELEASE_YEAR): Define it. + (.sh): Use it. + Thanks to a prod from Eric Blake. + Ensure that "group --version" always prints the current year. * src/groups.sh (version): Use @CURRENT_YEAR@, rather than 2006. * src/Makefile.am (.sh): Also substitute for @CURRENT_YEAR@. diff --git a/src/Makefile.am b/src/Makefile.am index ddd13efd4..7aa504b36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -115,11 +115,16 @@ $(PROGRAMS): ../lib/libcoreutils.a SUFFIXES = .sh +# Get the release year from ../lib/version-etc.c. +RELEASE_YEAR = \ + `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \ + $(top_srcdir)/lib/version-etc.c` + .sh: rm -f $@ $@-t sed \ -e 's!@''bindir''@!$(bindir)!' \ - -e 's/@''CURRENT_YEAR'@/`date +%Y`/ \ + -e 's/@''RELEASE_YEAR'@/$(RELEASE_YEAR)/ \ -e 's/@''GNU_PACKAGE''@/$(GNU_PACKAGE)/' \ -e 's/@''PACKAGE_BUGREPORT''@/$(PACKAGE_BUGREPORT)/' \ -e 's/@''VERSION''@/$(VERSION)/' $< > $@-t diff --git a/src/groups.sh b/src/groups.sh index f416fdb97..dd32c63c5 100755 --- a/src/groups.sh +++ b/src/groups.sh @@ -32,7 +32,7 @@ Same as id -Gn. If no USERNAME, use current process. Report bugs to <@PACKAGE_BUGREPORT@>." version='groups (@GNU_PACKAGE@) @VERSION@ -Copyright (C) @CURRENT_YEAR@ Free Software Foundation, Inc. +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>. There is NO WARRANTY, to the extent permitted by law. |