* [PATCH nft] build: fix tentative generation of nft.8 after disabled doc
@ 2020-05-15 16:31 Laura Garcia Liebana
2020-05-16 20:17 ` Phil Sutter
2020-05-18 10:36 ` Pablo Neira Ayuso
0 siblings, 2 replies; 6+ messages in thread
From: Laura Garcia Liebana @ 2020-05-15 16:31 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo, mattst88, devel
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
A2X_OPTS_MANPAGE = -L --doctype manpage --format manpage -D ${builddir}
@@ -16,7 +17,6 @@ EXTRA_DIST = ${ASCIIDOCS} ${man_MANS} libnftables-json.adoc libnftables.adoc
CLEANFILES = \
*~
-if BUILD_MAN
nft.8: ${ASCIIDOCS}
${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $<
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH nft] build: fix tentative generation of nft.8 after disabled doc 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 10:36 ` Pablo Neira Ayuso 1 sibling, 1 reply; 6+ messages in thread From: Phil Sutter @ 2020-05-16 20:17 UTC (permalink / raw) To: Laura Garcia Liebana; +Cc: netfilter-devel, pablo, mattst88, devel Hi Laura, 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. Cheers, Phil ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH nft] build: fix tentative generation of nft.8 after disabled doc 2020-05-16 20:17 ` Phil Sutter @ 2020-05-16 21:12 ` Laura García Liébana 2020-05-18 11:00 ` Phil Sutter 0 siblings, 1 reply; 6+ messages in thread From: Laura García Liébana @ 2020-05-16 21:12 UTC (permalink / raw) To: Phil Sutter, Laura Garcia Liebana, Netfilter Development Mailing list, Pablo Neira Ayuso, mattst88, devel On Sat, May 16, 2020 at 10:17 PM Phil Sutter <phil@nwl.cc> wrote: > > Hi Laura, > > 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? Thanks! ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH nft] build: fix tentative generation of nft.8 after disabled doc 2020-05-16 21:12 ` Laura García Liébana @ 2020-05-18 11:00 ` Phil Sutter 2020-05-18 11:04 ` Laura García Liébana 0 siblings, 1 reply; 6+ messages in thread From: Phil Sutter @ 2020-05-18 11:00 UTC (permalink / raw) To: Laura García Liébana Cc: Netfilter Development Mailing list, Pablo Neira Ayuso, mattst88, devel 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH nft] build: fix tentative generation of nft.8 after disabled doc 2020-05-18 11:00 ` Phil Sutter @ 2020-05-18 11:04 ` Laura García Liébana 0 siblings, 0 replies; 6+ messages in thread From: Laura García Liébana @ 2020-05-18 11:04 UTC (permalink / raw) To: Phil Sutter, Laura García Liébana, Netfilter Development Mailing list, Pablo Neira Ayuso, mattst88, devel On Mon, May 18, 2020 at 1:00 PM Phil Sutter <phil@nwl.cc> 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@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> > Ok, great. Thank you for your checking. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH nft] build: fix tentative generation of nft.8 after disabled doc 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-18 10:36 ` Pablo Neira Ayuso 1 sibling, 0 replies; 6+ messages in thread From: Pablo Neira Ayuso @ 2020-05-18 10:36 UTC (permalink / raw) To: Laura Garcia Liebana; +Cc: netfilter-devel, mattst88, devel 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") Applied, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-18 11:04 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 2020-05-18 11:04 ` Laura García Liébana 2020-05-18 10:36 ` Pablo Neira Ayuso
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).