From 2f9afa34397f476dc8ba4a7e40bc39b299e569a7 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 24 Jan 2022 07:39:44 -0800 Subject: [PATCH v2] bfd: Update doc/local.mk 1. Remove %D%/bfd.texi. 2. Pass -Idoc to $(MAKEINFOHTML). 3. Replace bfd.texi with %D%/bfd.texi. PR binutils/28807 * Makefile.in: Regenerate. * doc/local.mk (%D%/bfd.texi): Removed. (doc/bfd/index.html): Pass -Idoc to $(MAKEINFOHTML) and replace bfd.texi with %D%/bfd.texi. --- bfd/Makefile.in | 4 ++-- bfd/doc/local.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in index e48a0b87bc9..c203e8d8f22 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -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 -I$(srcdir) -Idoc -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..511457145ac 100644 --- a/bfd/doc/local.mk +++ b/bfd/doc/local.mk @@ -118,7 +118,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 +147,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 -I$(srcdir) -Idoc -o %D%/bfd $(srcdir)/%D%/bfd.texi MAINTAINERCLEANFILES += %D%/bfd.info -- 2.34.1