From 4f2813a313ae03d1a3d39e4b38a5bf8e549b16b1 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 7 Apr 2020 12:05:08 -0700 Subject: build: Include generated man pages in dist tarball Most projects ship pre-generated man pages in the distribution tarball so that builders don't need the documentation tools installed, similar to how bison-generated sources are included. To do this, we conditionalize the presence check of a2x on whether nft.8 already exists in the source directory, as it would exist if included in the distribution tarball. Secondly, we move the 'if BUILD_MAN' conditional to around the man page generation rules. This ensures that the man pages are unconditionally installed. Also only add the man pages to CLEANFILES if their generation is enabled. Signed-off-by: Matt Turner Signed-off-by: Pablo Neira Ayuso --- doc/Makefile.am | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'doc/Makefile.am') diff --git a/doc/Makefile.am b/doc/Makefile.am index f0958b33..6bd90aa6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,4 @@ -if BUILD_MAN man_MANS = nft.8 libnftables-json.5 libnftables.3 -endif A2X_OPTS_MANPAGE = -L --doctype manpage --format manpage -D ${builddir} @@ -13,6 +11,12 @@ ASCIIDOC_INCLUDES = \ statements.txt ASCIIDOCS = ${ASCIIDOC_MAIN} ${ASCIIDOC_INCLUDES} +EXTRA_DIST = ${ASCIIDOCS} ${man_MANS} libnftables-json.adoc libnftables.adoc + +CLEANFILES = \ + *~ + +if BUILD_MAN nft.8: ${ASCIIDOCS} ${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $< @@ -22,10 +26,5 @@ nft.8: ${ASCIIDOCS} .adoc.5: ${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $< -EXTRA_DIST = ${ASCIIDOCS} libnftables-json.adoc libnftables.adoc - -CLEANFILES = \ - nft.8 \ - libnftables-json.5 \ - libnftables.3 \ - *~ +CLEANFILES += ${man_MANS} +endif -- cgit v1.2.3