On Sunday 23 October 2011, Jonathan Nieder wrote: > Stefano Lattarini wrote: > > > Here is my proposed patch (for maint). > > Thanks! Two nits: > Thanks for the quick review, consider those nits fixed. Also, I've seen that the test script I've added was creating a dummy `texinfo.tex' file, instead of allowing "automake -a" to install a real one (this was a leftover of a previous version of the patch); I've fixed that too.
Here is what I've squashed in: diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 0279bf3..80712cf 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -209,7 +209,7 @@ install-info-am: $(INFO_DEPS) $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) ## Only run this code if install-info actually exists, and if the user -## don't request it not to be run (through the `AM_UPDATE_INFO_DIR' +## doesn't request it not to be run (through the `AM_UPDATE_INFO_DIR' ## environment variable). See automake bug#9773 and Debian Bug#543992. @am__run_installinfo=yes; \ case $$AM_UPDATE_INFO_DIR in \ diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test index b10a5ad..f75b115 100755 --- a/tests/install-info-dir.test +++ b/tests/install-info-dir.test @@ -18,8 +18,8 @@ # Details about the individual checks' purposes and motivations are # inlined, below. -# FIXME: this test is a good candidate for a conversion top TAP. -# FIXME: and could be merged with txinfo27.test +# FIXME: this test is a good candidate for a conversion to TAP, +# FIXME: and could be merged with `txinfo27.test'. required=makeinfo . ./defs || Exit 1 @@ -48,10 +48,8 @@ Hello world! @bye END -: > texinfo.tex - $ACLOCAL -$AUTOMAKE +$AUTOMAKE -a $AUTOCONF instdir=_inst