* lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and

	AM_MAKEINFOFLAGS.
	(.%SUFFIX%.dvi): Likewise.
	(.%SUFFIX%): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6d12b0b8e91375d5aa7ca2eea4ceae0652b89828..468e585f8daf2f2bcf5c8ffb8e0cafd6511a40c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-28  Tom Tromey  <tromey@redhat.com>
+
+       * lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and
+       AM_MAKEINFOFLAGS.
+       (.%SUFFIX%.dvi): Likewise.
+       (.%SUFFIX%): Likewise.
+
 2001-05-27  Tom Tromey  <tromey@redhat.com>
 
        * automake.in (handle_multilib): Only add multilib support code at

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 747a3288c889b8d9d7df36eac250e36780000294..f36ba76498f79f5620f4673aebd0a2f951352b7c 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -28,15 +28,18 @@
 ## around -- dead files which will end up in the distribution.
 ?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 ?!CYGNUS?      cd $(srcdir) \
-?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?!CYGNUS?        && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+?!CYGNUS?             `echo $< | sed 's,.*/,,'`
 ?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
+?CYGNUS?       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+?CYGNUS?         -I $(srcdir) $<
 
 .%SUFFIX%.dvi:
        TEXINPUTS=%TEXINFODIR%:$$TEXINPUTS \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir.
-         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+       $(TEXI2DVI) $<
 
 .%SUFFIX%:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -49,6 +52,8 @@
 ## around -- dead files which will end up in the distribution.
 ?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 ?!CYGNUS?      cd $(srcdir) \
-?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?!CYGNUS?        && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+?!CYGNUS?             `echo $< | sed 's,.*/,,'`
 ?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
+?CYGNUS?       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+?CYGNUS?         -I $(srcdir) $<