[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-572-g17087f1

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=17087f13dedddf59cf6acae916d5b58688418842

The branch, branch-1.11 has been updated
       via  17087f13dedddf59cf6acae916d5b58688418842 (commit)
       via  3df373a8d62784eeab87452a42a08d11b7e75722 (commit)
       via  12f0a41009a4277f0ee705afa7cb2750451379dd (commit)
      from  4e210412ea505cecc65610f11d98db87d4aa439f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 17087f13dedddf59cf6acae916d5b58688418842
Merge: 4e21041 3df373a
Author: Stefano Lattarini <address@hidden>
Date:   Sun Oct 30 12:16:41 2011 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      fix: regenerate Makefiles

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.in |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b1d02f3..d5b88f0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -725,8 +725,13 @@ install-info-am: $(INFO_DEPS)
          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
          $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
        @$(POST_INSTALL)
-       @if (install-info --version && \
-            install-info --version 2>&1 | sed 1q | grep -i -v debian) 
>/dev/null 2>&1; then \
+       @am__run_installinfo=yes; \
+       case $$AM_UPDATE_INFO_DIR in \
+         n|no|NO) am__run_installinfo=no;; \
+         *) (install-info --version) >/dev/null 2>&1 \
+              || am__run_installinfo=no;; \
+       esac; \
+       if test $$am__run_installinfo = yes; then \
          list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \


hooks/post-receive
-- 
GNU Automake