diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-01 12:43:22 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-01 12:43:46 +0200 |
| commit | c1c27cf134f49bbe71ae919bf8c39dd9467795b9 (patch) | |
| tree | 8565e06b74d384077dae9cb058c248d1aaa1cd5a /bootstrap.sh | |
| parent | 5bcc8fa10fba5b0a504ff3735862359e878693a3 (diff) | |
| download | automake-c1c27cf134f49bbe71ae919bf8c39dd9467795b9.tar.gz | |
bootstrap: consistently use correct copyright year
Suggested by Peter Johansson in the discussion about automake bug#11356:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11356#41>
* boostrap.sh (dosubst): Don't initialize the substituted value for the
release year from the current year (using `date +%Y`); instead, do it
through ...
($RELEASE_YEAR): ... this new statically-defined variable. To ensure it
won't get out-of-sync, it will be automatically updated ...
* Makefile.am (update-copyright): ... by this target's recipe.
Since are at it, fix a botched output redirection for an error message,
i.e., use ">&2" instead of ">&1".
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 1cede01aa..683b9e9d0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -36,6 +36,9 @@ VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac` PACKAGE=automake datadir=. PERL_THREADS=0 +# This should be automatically updated by the 'update-copyright' +# rule of our Makefile. +RELEASE_YEAR=2012 # Override SHELL. This is required on DJGPP so that Perl's system() # uses bash, not COMMAND.COM which doesn't quote arguments properly. @@ -77,8 +80,6 @@ dosubst () { rm -f $2 in=`echo $1 | sed 's,^.*/,,'` - current_year=`date +%Y` && test -n "$current_year" \ - || { echo "$me: cannot get current year" >&2; exit 1; } sed -e "s%@APIVERSION@%$APIVERSION%g" \ -e "s%@PACKAGE@%$PACKAGE%g" \ -e "s%@PERL@%$PERL%g" \ @@ -86,7 +87,7 @@ dosubst () -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \ -e "s%@VERSION@%$VERSION%g" \ -e "s%@datadir@%$datadir%g" \ - -e "s%@RELEASE_YEAR@%$current_year%g" \ + -e "s%@RELEASE_YEAR@%$RELEASE_YEAR%G" \ -e "s%@configure_input@%Generated from $in; do not edit by hand.%g" \ $1 > $2 chmod a-w $2 |