From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 2 Jan 2013 14:19:55 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a23ae3037d49075d06df2a17d17d00e12c9f788;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  tests: reorganize tests on backslash issues
  style: add trailing ':' to some test cases
  tests: tweak tests on obsolete EXTRA_DATA variable
  tests: more significant names for some tests
  cosmetics: remove few occurrences of trailing whitespace
  docs: re-introduce mention of two-args AM_INIT_AUTOMAKE invocation
  texi: warn against '.txi' and '.texinfo' input suffixes
  cleanup: remove two lines of dead code in automake
  texi: warn against suffix-less info files
  build: respect silent rules in generation of "amhello" example tarball
  NEWS: fixlets and updates
  post-release: minor version bump (1.13.1a)
  release: stable minor release 1.13.1

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

1a23ae3037d49075d06df2a17d17d00e12c9f788
diff --cc Makefile.am
index 9ba100676,389da435c..13f419439
--- a/Makefile.am
+++ b/Makefile.am
@@@ -615,10 -617,10 +615,10 @@@ dist_doc_DATA = $(srcdir)/doc/amhello-1
  # aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
  # configure in 't/wrap'.
  $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
- 	$(AM_V_GEN): \
+ 	$(AM_V_GEN)tmp=amhello-output.tmp \
  	  && PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
  	  && export PATH \
 -	  && $(am__cd) $(srcdir)/doc/amhello \
 +	  && cd $(srcdir)/doc/amhello \
  	  && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
  	  && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
  	  && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
@@@ -626,11 -628,21 +626,21 @@@
  	  && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
  	  && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
  	  && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
- 	  && $(am_AUTORECONF) -vfi \
- 	  && ./configure \
- 	  && $(MAKE) distcheck \
- 	  && $(MAKE) distclean \
- 	  && rm -rf $(amhello_configury) \
+ 	  && ( \
+ 	    { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
+ 	      && $(am_AUTORECONF) -vfi \
+ 	      && ./configure \
 -	      && $(MAKE) $(AM_MAKEFLAGS) distcheck \
 -	      && $(MAKE) $(AM_MAKEFLAGS) distclean \
++	      && $(MAKE) distcheck \
++	      && $(MAKE) distclean \
+ 	      || { \
+ 	        if $(AM_V_P); then :; else \
+ 	          echo "$@: recipe failed." >&5; \
+ 	          echo "See file '`pwd`/$$tmp' for details" >&5; \
+ 		fi; \
+ 	        exit 1; \
+ 	      } \
+ 	  ) \
+ 	  && rm -rf $(amhello_configury) $$tmp \
  	  && mv -f amhello-1.0.tar.gz ..
  
  
diff --cc automake.in
index d6f0bb914,68d14c987..2bb3e1f60
--- a/automake.in
+++ b/automake.in
@@@ -2715,10 -3137,18 +2713,9 @@@ sub handle_texinfo_helper ($
        ($info_texinfos->value_as_list_recursive (inner_expand => 1))
      {
        my $infobase = $texi;
-       $infobase =~ s/\.texi$//;
- 
-       if ($infobase eq $texi)
- 	{
 -      if ($infobase =~ s/\.texi$//)
 -        {
 -          1; # Nothing more to do.
 -        }
 -      elsif ($infobase =~ s/\.(txi|texinfo)$//)
++      # Strip tailing '.texi' suffix, complain if it's not there.
++      if ($infobase !~ s/\.texi$//)
+         {
 -	  msg_var 'obsolete', $info_texinfos,
 -	          "suffix '.$1' for Texinfo files is discouraged;" .
 -                  " use '.texi' instead";
 -        }
 -      else
 -	{
  	  # FIXME: report line number.
  	  err_am "texinfo file '$texi' has unrecognized extension";
  	  next;
diff --cc t/txinfo-makeinfo-error-no-clobber.sh
index c567e89f0,f4b7d01b1..6b7323e60
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
@@@ -66,6 -71,8 +71,9 @@@ cp main.texi sub/main.tex
  mv main.old main.texi
  $MAKE && exit 1
  test -f main.info
 +test -f sub/main.info
+ test ! -e main.info-1
+ test -f sub/main.info
+ test -f sub/main.info-1
  
  :