diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-01-24 02:53:13 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-28 02:50:29 -0500 |
| commit | c1b799a0be944c43eaff2b2f3346e5d51ea24a28 (patch) | |
| tree | 6ad33e04ddae994e6938c086e9fe6b956996f4c6 /t/txinfo-subdir-pr343.sh | |
| parent | 560216a4fc349fd7dce659496813f3ee953f7694 (diff) | |
| download | automake-c1b799a0be944c43eaff2b2f3346e5d51ea24a28.tar.gz | |
texi: pass automatic -I to dvi & pdf generation
Fixes automake bug https://bugs.gnu.org/23599.
When generating info/html pages, automake adds -I flags to source
dirs that contain the texi files, but it doesn't do this for dvi or
pdf formats. Instead, automake has been relying on texi2dvi to use
makeinfo for expanding macros, and it hasn't done that by default in
a long time.
Since adding --expand to the texi2dvi call is undesirable (due to bad
and unpredictable BEHAVIOR), pass those automatic -I flags directly
to TEXI2DVI & TEXI2PDF so they work regardless of --expand behavior.
We have to keep the MAKEINFO= setting around as texi2dvi might itself
fall back to it if the version of tex is old or broken.
* bin/automake.in: Add comment about $makeinfoflags usage.
* doc/automake.texi: Mention automatic -I subdir flags.
* lib/am/texibuild.am: Pass %MAKEINFOFLAGS% to TEXI2DVI & TEXI2PDF.
* t/txinfo-subdir-pr343.sh: Check for -I subdir usage.
Diffstat (limited to 't/txinfo-subdir-pr343.sh')
| -rw-r--r-- | t/txinfo-subdir-pr343.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/txinfo-subdir-pr343.sh b/t/txinfo-subdir-pr343.sh index 625a4faa7..085d53e2b 100644 --- a/t/txinfo-subdir-pr343.sh +++ b/t/txinfo-subdir-pr343.sh @@ -57,4 +57,9 @@ $MAKE distcheck test -f ../subdir/main.info test ! -e subdir/main.info +# Make sure automatic -I flags were added for the subdir. +grep '\$(MAKEINFO).* -I subdir ' ../Makefile.in +grep '\$(TEXI2DVI).* -I subdir ' ../Makefile.in +grep '\$(TEXI2PDF).* -I subdir ' ../Makefile.in + : |