Install NZD-related man pages conditionally

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

diff --git a/configure b/configure
index dfcbb54a85a10be94c6ca45cd82ff05bb07b44e1..009d600292dcbfe81c3a088c2acd5ba255b6af22 100755 (executable)
--- a/configure
+++ b/configure
@@ -732,6 +732,7 @@ JSON_C_LIBS
 JSON_C_CFLAGS
 LIBXML2_LIBS
 LIBXML2_CFLAGS
+NZD_MANS
 NZDTARGETS
 NZDSRCS
 NZD_TOOLS
@@ -17986,6 +17987,7 @@ $as_echo "#define HAVE_LMDB 1" >>confdefs.h
        NZD_TOOLS="nzd"
        NZDSRCS='${NZDSRCS}'
        NZDTARGETS='${NZDTARGETS}'
+       NZD_MANS='${nzd_man8_MANS}'
 fi
 
 

diff --git a/configure.ac b/configure.ac
index d6cce71f1912944b7189a565ff98c6448a592706..5f211cd1f96e7851a24854b6308d0713c08de724 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1286,10 +1286,12 @@ then
        NZD_TOOLS="nzd"
        NZDSRCS='${NZDSRCS}'
        NZDTARGETS='${NZDTARGETS}'
+       NZD_MANS='${nzd_man8_MANS}'
 fi
 AC_SUBST(NZD_TOOLS)
 AC_SUBST(NZDSRCS)
 AC_SUBST(NZDTARGETS)
+AC_SUBST(NZD_MANS)
 
 #
 # was --with-libxml2 specified?

diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index dcb6c9d1352a3f3d038d698abe767f7029235ca2..4be79eb521187deb5c9b4e57c626efb4b88ed87a 100644 (file)
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -48,7 +48,6 @@ man8_MANS =                   \
        named-checkconf.8       \
        named-checkzone.8       \
        named-journalprint.8    \
-       named-nzd2nzf.8         \
        named.8                 \
        nsec3hash.8             \
        rndc-confgen.8          \
@@ -135,6 +134,9 @@ MANPAGES_IN = \
 dnstap_man1_MANS =             \
        dnstap-read.1
 
+nzd_man8_MANS =                        \
+       named-nzd2nzf.8
+
 pkcs11_man8_MANS =             \
        pkcs11-destroy.8        \
        pkcs11-keygen.8         \
@@ -174,7 +176,7 @@ man_SPHINXOPTS =                            \
 all: man
        @:
 
-man:: ootsetup $(man1_MANS) $(man5_MANS) $(man8_MANS) @DNSTAP_MANS@ @PKCS11_MANS@
+man:: ootsetup $(man1_MANS) $(man5_MANS) $(man8_MANS) @DNSTAP_MANS@ @NZD_MANS@ @PKCS11_MANS@
 
 doc:: @HTMLTARGET@ @PDFTARGET@
 
@@ -222,6 +224,11 @@ $(dnstap_man1_MANS): @MANSRCS@
                $(man_SUBST) $${m}in > $$m; \
        done
 
+$(nzd_man8_MANS): @MANSRCS@
+       for m in $(nzd_man8_MANS); do \
+               $(man_SUBST) $${m}in > $$m; \
+       done
+
 $(pkcs11_man8_MANS): @MANSRCS@
        for m in $(pkcs11_man8_MANS); do \
                $(man_SUBST) $${m}in > $$m; \
@@ -239,6 +246,7 @@ install:: installdirs
        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 @NZD_MANS@; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
        for m in @PKCS11_MANS@; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
 
 uninstall::
@@ -246,6 +254,7 @@ uninstall::
        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 @NZD_MANS@; do rm -f ${DESTDIR}${mandir}/man8/$$m; done
        for m in @PKCS11_MANS@; do rm -f ${DESTDIR}${mandir}/man8/$$m; done
 
 docclean manclean maintainer-clean::
@@ -253,4 +262,4 @@ docclean manclean maintainer-clean::
 
 clean::
        -rm -rf $(SPHINXBUILDDIR)
-       -rm -f $(man1_MANS) $(man5_MANS) $(man8_MANS) @DNSTAP_MANS@ @PKCS11_MANS@
+       -rm -f $(man1_MANS) $(man5_MANS) $(man8_MANS) @DNSTAP_MANS@ @NZD_MANS@ @PKCS11_MANS@