To provide a bit more flexibility when invoking TEXI2DVI & TEXI2PDF, and provide a bit of symmetry with .info & .html generation, provide a AM_TEXI2FLAGS setting that is passed to all TEXI2xxx invocations.
* doc/automake.texi: Mention new AM_TEXI2FLAGS setting. * lib/am/texibuild.am: Pass $(AM_TEXI2FLAGS) to TEXI2DVI & TEXI2PDF. --- doc/automake.texi | 6 ++++-- lib/am/texibuild.am | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/automake.texi b/doc/automake.texi index 9916a41d4b79..d4b0d133a0dd 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -8143,12 +8143,14 @@ users to pass extra flags to suit their needs. @item AM_MAKEINFOFLAGS @itemx AM_MAKEINFOHTMLFLAGS +@itemx AM_TEXI2FLAGS Maintainer flags passed to each @command{makeinfo} invocation. Unlike @code{MAKEINFOFLAGS}, these variables are meant to be defined by maintainers in @file{Makefile.am}. @samp{$(AM_MAKEINFOFLAGS)} is -passed to @code{makeinfo} when building @file{.info} files; and +passed to @code{makeinfo} when building @file{.info} files; @samp{$(AM_MAKEINFOHTMLFLAGS)} is used when building @file{.html} -files. +files; and @samp{$(AM_TEXI2FLAGS)} is used when building @file{.dvi} and +@file{.pdf} files. @c Keep in sync with txinfo-many-output-formats.sh For instance, the following setting can be used to obtain one single diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 3f3f00d58df2..95d628df40d2 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -76,7 +76,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% ## avoid hitting a Texinfop bug that could cause low-probability racy ## failure when doing parallel builds; see: ## https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html - $(TEXI2DVI) %MAKEINFOFLAGS% %TEXIQUIET% --build-dir=$(@:.dvi=.t2d) -o $@ %TEXIDEVNULL% \ + $(TEXI2DVI) $(AM_TEXI2FLAGS) %MAKEINFOFLAGS% %TEXIQUIET% --build-dir=$(@:.dvi=.t2d) -o $@ %TEXIDEVNULL% \ ?GENERIC? %SOURCE% ?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% @@ -97,7 +97,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% ## avoid hitting a Texinfop bug that could cause low-probability racy ## failure when doing parallel builds; see: ## https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html - $(TEXI2PDF) %MAKEINFOFLAGS% %TEXIQUIET% --build-dir=$(@:.pdf=.t2p) -o $@ %TEXIDEVNULL% \ + $(TEXI2PDF) $(AM_TEXI2FLAGS) %MAKEINFOFLAGS% %TEXIQUIET% --build-dir=$(@:.pdf=.t2p) -o $@ %TEXIDEVNULL% \ ?GENERIC? %SOURCE% ?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% -- 2.34.1