From: Phil Sutter <phil@nwl.cc>
To: "Laura García Liébana" <nevola@gmail.com>
Cc: Netfilter Development Mailing list
<netfilter-devel@vger.kernel.org>,
Pablo Neira Ayuso <pablo@netfilter.org>,
mattst88@gmail.com, devel@zevenet.com
Subject: Re: [PATCH nft] build: fix tentative generation of nft.8 after disabled doc
Date: Mon, 18 May 2020 13:00:25 +0200 [thread overview]
Message-ID: <20200518110025.GI31506@orbyte.nwl.cc> (raw)
In-Reply-To: <CAF90-Wjn6vJJbjbSSiTqhcTqWGod9YyZTo3Ks2Q1JZx8Pj4dLg@mail.gmail.com>
Hi Laura,
On Sat, May 16, 2020 at 11:12:58PM +0200, Laura García Liébana wrote:
> On Sat, May 16, 2020 at 10:17 PM Phil Sutter <phil@nwl.cc> wrote:
> > On Fri, May 15, 2020 at 06:31:51PM +0200, Laura Garcia Liebana wrote:
> > > Despite doc generation is disabled, the makefile is trying to build it.
> > >
> > > $ ./configure --disable-man-doc
> > > $ make
> > > Making all in doc
> > > make[2]: Entering directory '/workdir/build-pkg/workdir/doc'
> > > make[2]: *** No rule to make target 'nft.8', needed by 'all-am'. Stop.
> > > make[2]: Leaving directory '/workdir/build-pkg/workdir/doc'
> > > make[1]: *** [Makefile:479: all-recursive] Error 1
> > > make[1]: Leaving directory '/workdir/build-pkg/workdir'
> > > make: *** [Makefile:388: all] Error 2
> > >
> > > Fixes: 4f2813a313ae0 ("build: Include generated man pages in dist tarball")
> > >
> > > Reported-by: Adan Marin Jacquot <adan.marin@zevenet.com>
> > > Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
> > > ---
> > > doc/Makefile.am | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/doc/Makefile.am b/doc/Makefile.am
> > > index 6bd90aa6..21482320 100644
> > > --- a/doc/Makefile.am
> > > +++ b/doc/Makefile.am
> > > @@ -1,3 +1,4 @@
> > > +if BUILD_MAN
> > > man_MANS = nft.8 libnftables-json.5 libnftables.3
> >
> > Did you make sure that dist tarball still contains the generated man
> > pages after your change? Because that's what commit 4f2813a313ae0
> > ("build: Include generated man pages in dist tarball") tried to fix and
> > apparently broke what you're fixing for.
> >
>
> Hi Phil, I tested these cases:
> - if the nft.8 already exists it won't be generated
> - if it doesn't exist it will be generated
> - if disable-man-doc then it won't be generated
>
> I'm missing something?
No, I think your patch is fine. I wasn't sure what happens if man_MANS,
EXTRA_DIST, etc. get enclosed by the conditional. Matt's patch
explicitly removed the conditionals around man_MANS.
I tried 'make dist' after configure with --enable-man-doc and the
generated tarball's build system seems to behave fine (man pages are
included, not built again and also installed from 'make install').
So for your patch:
Acked-by: Phil Sutter <phil@nwl.cc>
Thanks, Phil
next prev parent reply other threads:[~2020-05-18 11:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 16:31 [PATCH nft] build: fix tentative generation of nft.8 after disabled doc Laura Garcia Liebana
2020-05-16 20:17 ` Phil Sutter
2020-05-16 21:12 ` Laura García Liébana
2020-05-18 11:00 ` Phil Sutter [this message]
2020-05-18 11:04 ` Laura García Liébana
2020-05-18 10:36 ` Pablo Neira Ayuso
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=20200518110025.GI31506@orbyte.nwl.cc \
--to=phil@nwl.cc \
--cc=devel@zevenet.com \
--cc=mattst88@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=nevola@gmail.com \
--cc=pablo@netfilter.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 NNTP newsgroup(s).