From 961b539778bf735216c26be2b27018f731456849 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 28 May 2001 23:58:45 +0000 Subject: [PATCH] * lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and AM_MAKEINFOFLAGS. (.%SUFFIX%.dvi): Likewise. (.%SUFFIX%): Likewise. --- ChangeLog | 7 +++++++ lib/am/texibuild.am | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d12b0b8..468e585f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-05-28 Tom Tromey + + * lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and + AM_MAKEINFOFLAGS. + (.%SUFFIX%.dvi): Likewise. + (.%SUFFIX%): Likewise. + 2001-05-27 Tom Tromey * automake.in (handle_multilib): Only add multilib support code at diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 747a3288..f36ba764 100644 --- 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) $< -- 2.43.5