mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-25 14:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

bfd: fix generation of bfd.texi in out-of-tree builds

Browse Source 
[In the sequel TS means $(top_srcdir) and TB means $(top_builddir)]

The Texinfo file TS/bfd/doc/bfd.texi @includes many other .texi files
such as:

   bfdt.texi
   bfdio.texi
   section.texi
   ...

These .texi files are generated from the bfd/*.c source files, by a
program called `chew' that is distributed along with BFD, via some
default rules and macro magic in TS/bfd/doc/local.mk.  Important
point: the .texi files are generated in TB/bfd/doc/, not TS/bfd/doc.

Now, AM_MAKEINFOFLAGS in local.mk is defined as:

  AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/%D%" -I %D%

Where %D% is 'doc/' in this case.  Now, it looks like the directory
containing the .texi file is automatically inserted in the @include
search path, so the -I %D% above places TB/bfd/doc _after_ TS/bfd/doc.

Since currently TS/bfd/doc/bfdt.texi is outdated and is missing some
nodes, the error above happens.

This patch changes bfd/doc/local.mk to use -P to prepend the current
build directory to the @include search path, rather than -I, which
appends it.

bfd/ChangeLog:

2025-01-23  Jose E. Marchesi  <jose.marchesi@oracle.com>

	* doc/local.mk (AM_MAKEINFOFLAGS): Prepend the build directory to
	the @include search path.
	* Makefile.in: Regenerate.
This commit is contained in:
Jose E. Marchesi 2025-01-23 20:16:09 +01:00
parent b132f2344c
commit 19125d93aa
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2025-01-23 Jose E. Marchesi <jose.marchesi@oracle.com>
* doc/local.mk (AM_MAKEINFOFLAGS): Prepend the build directory to
the @include search path.
* Makefile.in: Regenerate.
2025-01-19 Nick Clifton <nickc@redhat.com>
* 2.44 Branch point.

2
bfd/Makefile.in
View File

@ -1301,7 +1301,7 @@ 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 -I "$(srcdir)/doc" -I doc
AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/doc" -P doc
TEXI2DVI = texi2dvi -I "$(srcdir)/doc" -I doc
MKDOC = doc/chew$(EXEEXT_FOR_BUILD)

2
bfd/doc/local.mk
View File

@ -72,7 +72,7 @@ TEXIDIR = $(srcdir)/../texinfo/fsf
info_TEXINFOS = %D%/bfd.texi
%C%_bfd_TEXINFOS = $(DOCFILES) %D%/bfdsumm.texi
AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/%D%" -I %D%
AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/%D%" -P %D%
TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I %D%
MKDOC = %D%/chew$(EXEEXT_FOR_BUILD)