67-texinfo-recursive.patch

[Akim Demaille]

Isn't this beautiful?  A *.am file only change!

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * subdirs.am: Don't define info related recursive targets.
        * texinfos.am: Do.

Index: Makefile.in
--- Makefile.in Tue, 13 Mar 2001 01:18:40 +0100 akim (am/h/16_Makefile.i 1.53 
644)
+++ Makefile.in Tue, 13 Mar 2001 01:24:41 +0100 akim (am/h/16_Makefile.i 1.53 
644)
@@ -131,11 +131,10 @@
 DATA = $(dist_pkgdata_DATA) $(dist_script_DATA)


-RECURSIVE_TARGETS = all-recursive install-data-recursive \
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+       uninstall-info-recursive all-recursive install-data-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
-       uninstall-recursive install-info-recursive \
-       uninstall-info-recursive check-recursive installcheck-recursive \
-       info-recursive dvi-recursive
+       uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
        COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
        README-alpha THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
Index: subdirs.am
--- subdirs.am Tue, 13 Mar 2001 01:18:40 +0100 akim (am/g/14_subdirs.am 1.9 644)
+++ subdirs.am Tue, 13 Mar 2001 01:23:32 +0100 akim (am/g/14_subdirs.am 1.9 644)
@@ -20,8 +20,7 @@
 RECURSIVE_TARGETS += \
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive \
-?INSTALL-INFO?install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive
+check-recursive installcheck-recursive

 .PHONY: $(RECURSIVE_TARGETS)

Index: texinfos.am
--- texinfos.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/g/10_texinfos.a 1.16 
644)
+++ texinfos.am Tue, 13 Mar 2001 01:24:38 +0100 akim (am/g/10_texinfos.a 1.16 
644)
@@ -23,10 +23,15 @@
        $(DVIPS) $< -o $@

 .PHONY: info info-am dvi dvi-am
-?SUBDIRS?.PHONY info: info-recursive
-?SUBDIRS?.PHONY dvi: dvi-recursive
-?!SUBDIRS?info: info-am
-?!SUBDIRS?dvi: dvi-am
+if %?SUBDIRS%
+RECURSIVE_TARGETS += info-recursive dvi-recursive
+.PHONY info: info-recursive
+.PHONY dvi: dvi-recursive
+else %?SUBDIRS%
+info: info-am
+dvi: dvi-am
+endif %?SUBDIRS%
+
 info-am: $(INFO_DEPS)
 dvi-am: $(DVIS)

@@ -39,10 +44,16 @@
 ##
 ## TEXINFOS primary are always installed in infodir, hence install-data
 ## is hard coded.
-?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir)
-?SUBDIRS?.PHONY install-info: install-info-recursive
-?!SUBDIRS?.PHONY install-info: install-info-am
-?INSTALL-INFO?install-data-am: install-info-am
+if %?INSTALL-INFO%
+_am_installdirs += $(DESTDIR)$(infodir)
+install-data-am: install-info-am
+if %?SUBDIRS%
+RECURSIVE_TARGETS += install-info-recursive
+.PHONY install-info: install-info-recursive
+else %?SUBDIRS%
+.PHONY install-info: install-info-am
+endif %?SUBDIRS%
+endif %?INSTALL-INFO%
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(infodir)
@@ -83,9 +94,11 @@
 ## Uninstalling info pages.  ##
 ## ------------------------- ##

+?SUBDIRS?RECURSIVE_TARGETS += uninstall-info-recursive
 ?SUBDIRS?.PHONY uninstall-info: uninstall-info-recursive
 ?!SUBDIRS?.PHONY uninstall-info: uninstall-info-am
 ?INSTALL-INFO?uninstall-am: uninstall-info-am
+
 uninstall-info-am:
        $(PRE_UNINSTALL)
 ## Run two loops here so that we can handle PRE_UNINSTALL and