diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-01 14:04:56 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-01 14:04:56 +0200 |
| commit | 140ce85ed89d28f8130c6dcf471408823c268a33 (patch) | |
| tree | 00bbe32b65de1a10eab58b20c6c5c0fd60d9bb39 | |
| parent | de9e3447ddbaa5488d0d695611eeaa880b09a035 (diff) | |
| parent | 3687a13b055bfd6fb06ab27c9eb96eeee6e01341 (diff) | |
| download | automake-140ce85ed89d28f8130c6dcf471408823c268a33.tar.gz | |
Merge branch 'maint'
* maint:
news: fix confusing wording
news: fixed weaknesses in build system and testsuite
bootstrap: consistently use correct copyright year
fixup: remove leftover "TERM=ansi" definition in 't/color.sh'
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | NEWS | 9 | ||||
| -rwxr-xr-x | bootstrap.sh | 7 | ||||
| -rwxr-xr-x | t/color.sh | 3 |
4 files changed, 14 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 5fb8fe320..060cd4b96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -856,8 +856,9 @@ update_copyright_env = \ update-copyright: $(AM_V_GEN)set -e; \ current_year=`date +%Y` && test -n "$$current_year" \ - || { echo "$@: cannot get current year" >&1; exit 1; }; \ - sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" configure.ac; \ + || { echo "$@: cannot get current year" >&2; exit 1; }; \ + sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \ + bootstrap.sh configure.ac; \ excluded_re=`echo $(FETCHFILES) \ | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \ $(GIT) ls-files \ @@ -34,8 +34,8 @@ New in 1.12.1: * WARNING: Future backward-incompatibilities! - Autoconf 2.65 or later will be required by the next major Automake - version (1.13). Until now, Automake has been working with any - Autoconf version up to 2.62. + version (1.13). Until now, Automake has required Autoconf version + 2.62 or later. - Starting from the next major Automake version (1.13), the rules to build pdf, ps and dvi output from Texinfo input will use the '--tidy' @@ -70,6 +70,11 @@ New in 1.12.1: Bugs fixed in 1.12.1: +* Bugs introduced by 1.12: + + - Several weaknesses in the Automake's own build system test suite + have been fixed. + * Long-standing bugs: - When the 'color-tests' option is in use, forcing of colored testsuite 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 diff --git a/t/color.sh b/t/color.sh index c9fe302d0..c9a1ab999 100755 --- a/t/color.sh +++ b/t/color.sh @@ -19,9 +19,6 @@ . ./defs || Exit 1 -TERM=ansi -export TERM - esc='' # Escape '[' for grep, below. red="$esc\[0;31m" |