From b32be53f7a398e4aa9b5726db2d7d87c46fa1192 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 24 Jan 2022 07:39:44 -0800 Subject: [PATCH v3] bfd: Update doc/local.mk PR binutils/28807 * Makefile.in: Regenerate. * doc/local.mk (AM_MAKEINFOFLAGS): Add -I "$(srcdir)/%D%" -I %D%. (TEXI2DVI): New. (%D%/bfd.texi): Removed. (doc/bfd/index.html): Remove -I$(srcdir). Replace bfd.texi with %D%/bfd.texi. --- bfd/Makefile.in | 8 ++++---- bfd/doc/local.mk | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in index e48a0b87bc9..b06c0c98e9b 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -271,7 +271,6 @@ PDFS = doc/bfd.pdf PSS = doc/bfd.ps HTMLS = doc/bfd.html TEXINFOS = doc/bfd.texi -TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) @@ -1304,7 +1303,8 @@ SRCIPROT = $(srcdir)/cache.c $(srcdir)/libbfd.c \ TEXIDIR = $(srcdir)/../texinfo/fsf info_TEXINFOS = doc/bfd.texi doc_bfd_TEXINFOS = $(DOCFILES) doc/bfdsumm.texi -AM_MAKEINFOFLAGS = --no-split +AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/doc" -I doc +TEXI2DVI = texi2dvi -I "$(srcdir)/doc" -I doc MKDOC = doc/chew$(EXEEXT_FOR_BUILD) # We can't replace these rules with an implicit rule, because @@ -2505,7 +2505,7 @@ doc/%.stamp: $(srcdir)/%.c $(srcdir)/doc/doc.str $(MKDOC) doc/$(am__dirstamp) $(AM_V_GEN)$(REGEN_TEXI) # Avoid the %.stamp generating a builddir/bfd.texi that overrides the srcdir/. -doc/bfd.texi doc/bfd.stamp: doc/$(am__dirstamp) ; $(AM_V_at)touch $@ +doc/bfd.stamp: doc/$(am__dirstamp) ; $(AM_V_at)touch $@ # We use bfdt.texi, rather than bfd.texi, to avoid conflicting with # bfd.texi on an 8.3 filesystem. @@ -2526,7 +2526,7 @@ doc/bfdver.texi: $(srcdir)/Makefile.in html-local: doc/bfd/index.html doc/bfd/index.html: doc/bfd.texi $(bfd_TEXINFOS) doc/$(am__dirstamp) $(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \ - --split=node -I$(srcdir) -o doc/bfd $(srcdir)/bfd.texi + --split=node -o doc/bfd $(srcdir)/doc/bfd.texi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/bfd/doc/local.mk b/bfd/doc/local.mk index 18a2af1b01d..f57897ff682 100644 --- a/bfd/doc/local.mk +++ b/bfd/doc/local.mk @@ -77,7 +77,8 @@ TEXIDIR = $(srcdir)/../texinfo/fsf info_TEXINFOS = %D%/bfd.texi %C%_bfd_TEXINFOS = $(DOCFILES) %D%/bfdsumm.texi -AM_MAKEINFOFLAGS = --no-split +AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/%D%" -I %D% +TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I %D% MKDOC = %D%/chew$(EXEEXT_FOR_BUILD) @@ -118,7 +119,7 @@ REGEN_TEXI = \ $(AM_V_GEN)$(REGEN_TEXI) # Avoid the %.stamp generating a builddir/bfd.texi that overrides the srcdir/. -%D%/bfd.texi %D%/bfd.stamp: %D%/$(am__dirstamp) ; $(AM_V_at)touch $@ +%D%/bfd.stamp: %D%/$(am__dirstamp) ; $(AM_V_at)touch $@ # We use bfdt.texi, rather than bfd.texi, to avoid conflicting with # bfd.texi on an 8.3 filesystem. @@ -147,6 +148,6 @@ MAINTAINERCLEANFILES += $(DOCFILES) html-local: %D%/bfd/index.html %D%/bfd/index.html: %D%/bfd.texi $(bfd_TEXINFOS) %D%/$(am__dirstamp) $(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \ - --split=node -I$(srcdir) -o %D%/bfd $(srcdir)/bfd.texi + --split=node -o %D%/bfd $(srcdir)/%D%/bfd.texi MAINTAINERCLEANFILES += %D%/bfd.info -- 2.34.1