[PATCH v2] bfd: Update doc/local.mk

[Tobias Burnus]

Hi H.J.,

that works – but not completely as texi2dvi itself does not get passed the -I path.

Thus TEXI2PDF doc/bfd.pdf fails because:
   bfd/doc/bfd.texi:219: I can't find file `bfdt.texi'.

   l.219 @include bfdt.texi



I wonder whether part of your changes could/should be replaced
by the following, which mimics what binutils/doc/local.mk does:

--- a/bfd/doc/local.mk
+++ b/bfd/doc/local.mk
@@ -80 +80,3 @@ info_TEXINFOS = %D%/bfd.texi
-AM_MAKEINFOFLAGS = --no-split
+AM_MAKEINFOFLAGS = -I "$(srcdir)/%D%" -I ../bfd/doc \
+                  --no-split
+TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I ../bfd/doc



At least it seems to work when manually adding '-I doc -I $(srcdir)/doc'
to the 'doc/bfd.pdf' target's texi2pdf call.

Seems as we are almost there and as if the rest seems to work :-)

Thanks,

Tobias

On 24.01.22 18:48, H.J. Lu wrote:
> 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.
...
> --- 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
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955