[patch] trunk, 1.7.9: install-info bug with no-installinfo

[Maciej W. Rozycki]

Hello,

 Contrary to what's documented, the install-info target doesn't work with 
current versions of automake when the no-installinfo option is active.  I 
believe the bug crept in around 1.5.  Here are trivial fixes for both the 
trunk and 1.7.9.  Please apply.

2003-11-17  Maciej W. Rozycki  <address@hidden>

        * lib/am/texinfos.am (install-info): Depend on 
        install-info-recursive or install-info-am even if no-installinfo.

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: address@hidden, PGP key available        +

automake-1.7c-20031115-install-info.patch
diff -up --recursive --new-file automake.macro/lib/am/texinfos.am 
automake/lib/am/texinfos.am
--- automake.macro/lib/am/texinfos.am   Sat Nov 15 10:14:32 2003
+++ automake/lib/am/texinfos.am Sat Nov 15 16:26:44 2003
@@ -110,6 +110,7 @@ if %?LOCAL-TEXIS%
 am__installdirs += $(DESTDIR)$(infodir)
 install-data-am: install-info-am
 endif %?LOCAL-TEXIS%
+endif %?INSTALL-INFO%
 .PHONY: install-info
 if %?SUBDIRS%
 RECURSIVE_TARGETS += install-info-recursive
@@ -117,7 +118,6 @@ install-info: install-info-recursive
 else !%?SUBDIRS%
 install-info: install-info-am
 endif !%?SUBDIRS%
-endif %?INSTALL-INFO%
 
 .PHONY: install-info-am
 if %?LOCAL-TEXIS%

automake-1.7.8-install-info.patch
diff -up --recursive --new-file automake-1.7.8.macro/lib/am/texinfos.am 
automake-1.7.8/lib/am/texinfos.am
--- automake-1.7.8.macro/lib/am/texinfos.am     2003-10-03 08:55:45.000000000 
+0000
+++ automake-1.7.8/lib/am/texinfos.am   2003-11-10 23:49:48.000000000 +0000
@@ -104,13 +104,13 @@ if %?LOCAL-TEXIS%
 am__installdirs += $(DESTDIR)$(infodir)
 install-data-am: install-info-am
 endif %?LOCAL-TEXIS%
+endif %?INSTALL-INFO%
 if %?SUBDIRS%
 RECURSIVE_TARGETS += install-info-recursive
 .PHONY install-info: install-info-recursive
 else !%?SUBDIRS%
 install-info: install-info-am
 endif !%?SUBDIRS%
-endif %?INSTALL-INFO%
 
 .PHONY: install-info-am