* texinfos.am: No ?EXEC? hook as currently installing TEXINFOS is

necessarily in infodir.

diff --git a/ChangeLog b/ChangeLog
index 65461e2..ee5281d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-02-26  Akim Demaille  <akim@epita.fr>
 
+       * texinfos.am: No ?EXEC? hook as currently installing TEXINFOS is
+       necessarily in infodir.
+
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
        * automake.in ($am_file): Be `local', as my'd variables used in
        `foreach' loops are always private to the loop.
 

diff --git a/Makefile.in b/Makefile.in
index 6a7d31b..c009007 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -221,8 +221,6 @@ automake.dvi: automake.texi $(srcdir)/version.texi
 DVIPS = dvips
 .dvi.ps:
        $(DVIPS) $< -o $@
-?EXEC?insexec-data-am: install-info-am
-?!EXEC?install-data-am: install-info-am
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(infodir)
@@ -542,7 +540,8 @@ distclean: distclean-recursive
 
 distclean-am: clean-am distclean-generic distclean-tags
 
-install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA
+install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA \
+       install-info-am
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 7dea0c3..bf88632 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -29,8 +29,7 @@ DVIPS = dvips
 ## `install-info' for the user.
 ?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir)
 .PHONY: install-info-am
-?EXEC??INSTALL-INFO?insexec-data-am: install-info-am
-?!EXEC??INSTALL-INFO?install-data-am: install-info-am
+?INSTALL-INFO?install-data-am: install-info-am
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(infodir)

diff --git a/texinfos.am b/texinfos.am
index 7dea0c3..bf88632 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -29,8 +29,7 @@ DVIPS = dvips
 ## `install-info' for the user.
 ?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir)
 .PHONY: install-info-am
-?EXEC??INSTALL-INFO?insexec-data-am: install-info-am
-?!EXEC??INSTALL-INFO?install-data-am: install-info-am
+?INSTALL-INFO?install-data-am: install-info-am
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(infodir)