From: Tobias Burnus <tobias@codesourcery.com>
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>, Binutils <binutils@sourceware.org>
Subject: Re: [PATCH v2] bfd: Update doc/local.mk
Date: Mon, 24 Jan 2022 19:38:12 +0100 [thread overview]
Message-ID: <2f5ebae4-1d69-d529-f113-999cff3f5962@codesourcery.com> (raw)
In-Reply-To: <CAMe9rOq=UN7J80HVxkN+sOsJYF=qhxBVZhy_9iNDA9MY77mEuQ@mail.gmail.com>
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
next prev parent reply other threads:[~2022-01-24 18:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 9:05 [Regression] Build fail: 'doc/bfd/index.html' ($(build)/bfd/bfd.texi - no such file) – probably due to: "bfd: Properly install library and header files" Tobias Burnus
2022-01-24 13:21 ` H.J. Lu
2022-01-24 15:01 ` Tobias Burnus
2022-01-24 15:42 ` [PATCH] bfd: Pass -Idoc to $(MAKEINFOHTML) H.J. Lu
2022-01-24 16:52 ` Tobias Burnus
2022-01-24 17:48 ` [PATCH v2] bfd: Update doc/local.mk H.J. Lu
2022-01-24 18:38 ` Tobias Burnus [this message]
2022-01-24 18:53 ` [PATCH v3] " H.J. Lu
2022-01-24 20:35 ` Tobias Burnus
2022-01-24 20:56 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2f5ebae4-1d69-d529-f113-999cff3f5962@codesourcery.com \
--to=tobias@codesourcery.com \
--cc=binutils@sourceware.org \
--cc=hjl.tools@gmail.com \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).