Install dnstap-related man pages conditionally

Commit b580eb2fb32aba796efc4e73ceae067f0da76340 inadvertently caused
dnstap-related man pages to be installed unconditionally.  Ensure they
are only installed for dnstap-enabled builds.

diff --git a/configure b/configure
index 639b2b380adb229dd2284f9f93920ac1c1cfbd5d..dfcbb54a85a10be94c6ca45cd82ff05bb07b44e1 100755 (executable)
--- a/configure
+++ b/configure
@@ -697,6 +697,7 @@ FSTRM_LIBS
 FSTRM_CFLAGS
 PROTOBUF_C_LIBS
 PROTOBUF_C_CFLAGS
+DNSTAP_MANS
 DNSTAPTARGETS
 DNSTAPOBJS
 DNSTAPSRCS
@@ -20849,6 +20850,7 @@ $as_echo "#define HAVE_DNSTAP 1" >>confdefs.h
        DNSTAPSRCS='${DNSTAPSRCS}'
        DNSTAPOBJS='${DNSTAPOBJS}'
        DNSTAPTARGETS='${DNSTAPTARGETS}'
+       DNSTAP_MANS='${dnstap_man1_MANS}'
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 69417da25f8699d434fff8663d27be6c1afe18e1..d6cce71f1912944b7189a565ff98c6448a592706 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2011,11 +2011,13 @@ if test "x$use_dnstap" != "xno"; then
        DNSTAPSRCS='${DNSTAPSRCS}'
        DNSTAPOBJS='${DNSTAPOBJS}'
        DNSTAPTARGETS='${DNSTAPTARGETS}'
+       DNSTAP_MANS='${dnstap_man1_MANS}'
 fi
 AC_SUBST(DNSTAP)
 AC_SUBST(DNSTAPSRCS)
 AC_SUBST(DNSTAPOBJS)
 AC_SUBST(DNSTAPTARGETS)
+AC_SUBST(DNSTAP_MANS)
 AC_SUBST([PROTOBUF_C_CFLAGS])
 AC_SUBST([PROTOBUF_C_LIBS])
 AC_SUBST([FSTRM_CFLAGS])

diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index e0677ee0548269208612774d31f857f9a80241e7..dcb6c9d1352a3f3d038d698abe767f7029235ca2 100644 (file)
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -20,7 +20,6 @@ man1_MANS =                   \
        arpaname.1              \
        delv.1                  \
        dig.1                   \
-       dnstap-read.1           \
        host.1                  \
        mdig.1                  \
        named-rrchecker.1       \
@@ -133,6 +132,9 @@ MANPAGES_IN = \
        pkcs11-list.8in         \
        pkcs11-tokens.8in
 
+dnstap_man1_MANS =             \
+       dnstap-read.1
+
 pkcs11_man8_MANS =             \
        pkcs11-destroy.8        \
        pkcs11-keygen.8         \
@@ -172,7 +174,7 @@ man_SPHINXOPTS =                            \
 all: man
        @:
 
-man:: ootsetup $(man1_MANS) $(man5_MANS) $(man8_MANS) @PKCS11_MANS@
+man:: ootsetup $(man1_MANS) $(man5_MANS) $(man8_MANS) @DNSTAP_MANS@ @PKCS11_MANS@
 
 doc:: @HTMLTARGET@ @PDFTARGET@
 
@@ -215,6 +217,11 @@ $(man8_MANS): @MANSRCS@
                $(man_SUBST) $${m}in > $$m; \
        done
 
+$(dnstap_man1_MANS): @MANSRCS@
+       for m in $(dnstap_man1_MANS); do \
+               $(man_SUBST) $${m}in > $$m; \
+       done
+
 $(pkcs11_man8_MANS): @MANSRCS@
        for m in $(pkcs11_man8_MANS); do \
                $(man_SUBST) $${m}in > $$m; \
@@ -231,12 +238,14 @@ install:: installdirs
        for m in $(man1_MANS); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man1/; done
        for m in $(man5_MANS); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man5/; done
        for m in $(man8_MANS); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
+       for m in @DNSTAP_MANS@; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man1/; done
        for m in @PKCS11_MANS@; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
 
 uninstall::
        for m in $(man1_MANS); do rm -f ${DESTDIR}${mandir}/man1/$$m; done
        for m in $(man5_MANS); do rm -f ${DESTDIR}${mandir}/man5/$$m; done
        for m in $(man8_MANS); do rm -f ${DESTDIR}${mandir}/man8/$$m; done
+       for m in @DNSTAP_MANS@; do rm -f ${DESTDIR}${mandir}/man1/$$m; done
        for m in @PKCS11_MANS@; do rm -f ${DESTDIR}${mandir}/man8/$$m; done
 
 docclean manclean maintainer-clean::
@@ -244,4 +253,4 @@ docclean manclean maintainer-clean::
 
 clean::
        -rm -rf $(SPHINXBUILDDIR)
-       -rm -f $(man1_MANS) $(man5_MANS) $(man8_MANS) @PKCS11_MANS@
+       -rm -f $(man1_MANS) $(man5_MANS) $(man8_MANS) @DNSTAP_MANS@ @PKCS11_MANS@