4425. [bug] arpaname and dnstap-read were not being installed

                        into ${prefix}/bin.  Tidy up installation issues
                        with CHANGE 4421. [RT #42910]

diff --git a/CHANGES b/CHANGES
index 46dffcc25e5f90603e35637dada5d80c535b38e5..45b0cac1105e30966112ec05c7918a67532362b0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4425.  [bug]           arpaname and dnstap-read were not being installed
+                       into ${prefix}/bin.  Tidy up installation issues
+                       with CHANGE 4421. [RT #42910]
+
 4424.  [experimental]  Named now sends _ta-XXXX.<trust-anchor>/NULL queries
                        to provide feedback to the trust-anchor administrators
                        about how key rollovers are progressing as per

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index de2e205e7a341d20d56d651964bf385663471a54..b62a145d301994b9543ff821674a41235cc653ee 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -49,16 +49,14 @@ SRCS =              arpaname.c named-journalprint.c named-rrchecker.c \
                nsec3hash.c genrandom.c isc-hmac-fixup.c mdig.c \
                @DNSTAPSRCS@ @NZDSRCS@
 
-DNSTAPMAN =    dnstap-read.1
-NZDMAN =       named-nzd2nzf.8
-MANPAGES =     arpaname.1 named-journalprint.8 named-rrchecker.1 nsec3hash.8 \
-               genrandom.8 isc-hmac-fixup.8 mdig.1 @DNSTAPMAN@ @NZDMAN@
-
-DNSTAPHTML =   dnstap-read.html
-NZDHTML =      named-nzd2nzf.html
-HTMLPAGES =    arpaname.html named-journalprint.html named-rrchecker.html \
-               nsec3hash.html genrandom.html isc-hmac-fixup.html \
-               mdig.html @DNSTAPHTML@ @NZDHTML@
+MANPAGES =     arpaname.1 dnstap-read.1 genrandom.8 \
+               isc-hmac-fixup.8 mdig.1 named-journalprint.8 \
+               named-nzd2nzf.8 named-rrchecker.1 nsec3hash.8
+
+HTMLPAGES =    arpaname.html dnstap-read.html genrandom.html \
+               isc-hmac-fixup.html mdig.html named-journalprint.html \
+               named-nzd2nzf.html named-rrchecker.html nsec3hash.html
+
 MANOBJS =      ${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
@@ -112,6 +110,7 @@ docclean manclean maintainer-clean::
        rm -f ${MANOBJS}
 
 installdirs:
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
@@ -119,20 +118,20 @@ installdirs:
 nzd:
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-nzd2nzf@EXEEXT@ \
                ${DESTDIR}${sbindir}
+       ${INSTALL_DATA} ${srcdir}/named-nzd2nzf.8 ${DESTDIR}${mandir}/man8
 
 dnstap:
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} dnstap-read@EXEEXT@ \
-               ${DESTDIR}${sbindir}
+               ${DESTDIR}${bindir}
+       ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
 
-install:: ${TARGETS} @DNSTAP@ @NZD_TOOLS@ installdirs
+install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
-               ${DESTDIR}${sbindir}
+               ${DESTDIR}${bindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \
                ${DESTDIR}${sbindir}
-       ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-nzd2nzf@EXEEXT@ \
-               ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} genrandom@EXEEXT@ \
@@ -145,11 +144,9 @@ install:: ${TARGETS} @DNSTAP@ @NZD_TOOLS@ installdirs
        ${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8
        ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
        ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
-       ${INSTALL_DATA} ${srcdir}/named-nzd2nzf.8 ${DESTDIR}${mandir}/man8
        ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
        ${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
        ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
-       ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
 
 clean distclean::
        rm -f ${TARGETS}

diff --git a/configure b/configure
index 1a035ae56a8121fa99ec135a98a47a27cb4fda76..7554d263cc430973a60705e40e615ab9fb77383a 100755 (executable)
--- a/configure
+++ b/configure
@@ -699,8 +699,6 @@ DBLATEX
 PDFLATEX
 LATEX
 DNSTAP_PB_C_H
-DNSTAPHTML
-DNSTAPMAN
 DNSTAPTARGETS
 DNSTAPOBJS
 DNSTAPSRCS
@@ -814,8 +812,6 @@ MKDEPCC
 ZLIB
 JSONSTATS
 XMLSTATS
-NZDHTML
-NZDMAN
 NZDTARGETS
 NZDSRCS
 NZD_TOOLS
@@ -16838,8 +16834,6 @@ fi
 NZD_TOOLS=""
 NZDSRCS=
 NZDTARGETS=
-NZDMAN=
-NZDHTML=
 if test "X${have_lmdb}" != "X"
 then
        CFLAGS="$CFLAGS $lmdb_cflags"
@@ -16849,15 +16843,11 @@ $as_echo "#define HAVE_LMDB 1" >>confdefs.h
        NZD_TOOLS="nzd"
         NZDSRCS='${NZDSRCS}'
         NZDTARGETS='${NZDTARGETS}'
-        NZDMAN='${NZDMAN}'
-        NZDHTML='${NZDHTML}'
 fi
 
 
 
 
-
-
 #
 # was --with-libxml2 specified?
 #
@@ -20580,8 +20570,6 @@ DNSTAP=
 DNSTAPSRCS=
 DNSTAPOBJS=
 DNSTAPTARGETS=
-DNSTAPMAN=
-DNSTAPHTML=
 DNSTAP_PB_C_H=
 if test "x$use_dnstap" != "xno"; then
        if ! $use_threads; then
@@ -20795,8 +20783,6 @@ $as_echo "#define HAVE_DNSTAP 1" >>confdefs.h
        DNSTAPSRCS='${DNSTAPSRCS}'
        DNSTAPOBJS='${DNSTAPOBJS}'
        DNSTAPTARGETS='${DNSTAPTARGETS}'
-       DNSTAPMAN='${DNSTAPMAN}'
-       DNSTAPHTML='${DNSTAPHTML}'
        DNSTAP_PB_C_H="dnstap.pb-c.h"
 fi
 
@@ -20805,8 +20791,6 @@ fi
 
 
 
-
-
 #
 #  The following sets up how non-blocking i/o is established.
 #  Sunos, cygwin and solaris 2.x (x<5) require special handling.

diff --git a/configure.in b/configure.in
index 0cabe41ad9562a646a6fda503bc2ab173be3586f..d81388eea3ce2ba78453e00b482a8f7effc42e9b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2200,8 +2200,6 @@ fi
 NZD_TOOLS=""
 NZDSRCS=
 NZDTARGETS=
-NZDMAN=
-NZDHTML=
 if test "X${have_lmdb}" != "X"
 then
        CFLAGS="$CFLAGS $lmdb_cflags"
@@ -2209,14 +2207,10 @@ then
        NZD_TOOLS="nzd"
         NZDSRCS='${NZDSRCS}'
         NZDTARGETS='${NZDTARGETS}'
-        NZDMAN='${NZDMAN}'
-        NZDHTML='${NZDHTML}'
 fi
 AC_SUBST(NZD_TOOLS)
 AC_SUBST(NZDSRCS)
 AC_SUBST(NZDTARGETS)
-AC_SUBST(NZDMAN)
-AC_SUBST(NZDHTML)
 
 #
 # was --with-libxml2 specified?
@@ -4219,8 +4213,6 @@ DNSTAP=
 DNSTAPSRCS=
 DNSTAPOBJS=
 DNSTAPTARGETS=
-DNSTAPMAN=
-DNSTAPHTML=
 DNSTAP_PB_C_H=
 if test "x$use_dnstap" != "xno"; then
        if ! $use_threads; then
@@ -4272,16 +4264,12 @@ if test "x$use_dnstap" != "xno"; then
        DNSTAPSRCS='${DNSTAPSRCS}'
        DNSTAPOBJS='${DNSTAPOBJS}'
        DNSTAPTARGETS='${DNSTAPTARGETS}'
-       DNSTAPMAN='${DNSTAPMAN}'
-       DNSTAPHTML='${DNSTAPHTML}'
        DNSTAP_PB_C_H="dnstap.pb-c.h"
 fi
 AC_SUBST(DNSTAP)
 AC_SUBST(DNSTAPSRCS)
 AC_SUBST(DNSTAPOBJS)
 AC_SUBST(DNSTAPTARGETS)
-AC_SUBST(DNSTAPMAN)
-AC_SUBST(DNSTAPHTML)
 AC_SUBST(DNSTAP_PB_C_H)
 
 #