]> git.ipfire.org Git - thirdparty/automake.git/commit
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 20 Jun 2012 12:25:19 +0000 (14:25 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 20 Jun 2012 12:59:56 +0000 (14:59 +0200)
commitaa9036d432c0c8a671800ceb172303cd9a933e31
tree88b49d1860b50bbac0957dca79e7a256d2ce72af
parent6d02bf85a2b851f7519d96dafaa6e9b1f1588bad
parent9c22243af8307cd11923b3373314a5c7723d7c6d
Merge branch 'master' into ng/master

* master:
  maintcheck: guard against obsolete $required entries
  tests: drop requirement 'makeinfo-html'; 'makeinfo' is enough
  tests: drop requirement 'texi2dvi-o'; 'texi2dvi' is enough
  texi: require Texinfo >= 4.9, related enhancements
  docs: it's not true that DISTCHECK_CONFIGURE_FLAGS is maintainer-reserved

+ Extra non-trivial edits:

* t/silent-texi.sh ($required): Simply use 'makeinfo and 'texi2dvi',
instead of (respectively) 'makeinfo-html' and 'texi2dvi-o'.
* t/texinfo21b.sh: Fix a minor typo in heading comments.
($required): Simply use 'makeinfo instead of 'makeinfo-html'
* lib/am/texibuild.am: Merge the changes done in the master branch to
the ".texi -> .dvi" and ".texi -> .pdf" recipes into the definition
of the '$(am__texibuild_dvi_or_pdf)' make function, as well as into ...
(%.dvi: %.texi), (%.pdf: %.texi): ... calls to that function into these
pattern rules.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 files changed:
.gitignore
automake.in
defs
doc/automake-ng.texi
lib/am/texibuild.am
lib/am/texinfos.am
syntax-checks.mk
t/instdir-texi.sh
t/silent-texi.sh
t/txinfo21.sh
t/txinfo21b.sh
t/vtexi4.sh