On Mon, May 18, 2020 at 1:00 PM Phil Sutter <phil@xxxxxx> wrote:
>
> 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@xxxxxx> 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@xxxxxxxxxxx>
> > > > Signed-off-by: Laura Garcia Liebana <nevola@xxxxxxxxx>
> > > > ---
> > > > 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@xxxxxx>
>
Ok, great.
Thank you for your checking.
