Revert "Merge branch 'modified-manual-install-oot' into 'master'"

This reverts commit d9929b1b0a36c23cf9f85e2127533888cb150f28, reversing
changes made to 8abf2f23d0993347132e8cc46897ab1401766251.

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 0afbfae9c276d59435f13e8b8522525863ed6c4f..1a26c359ed1e8d487712b8bf9045699b2e3d9025 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -84,14 +84,12 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install-man8: ${MANPAGES}
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-       (cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
-
-install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs install-man8
+install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
        (cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@)
+       for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
+       (cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 44d87fd69ea701c20208bf771c475c7374c639ac..0588f8b7dabec84ba728ac337491e972a4383a99 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -93,14 +93,13 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install-man8: rndc-confgen.8 ddns-confgen.8
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-       (cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
-
-install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs install-man8
+install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc-confgen@EXEEXT@ ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ddns-confgen@EXEEXT@ ${DESTDIR}${sbindir}
+       ${INSTALL_DATA} ${srcdir}/rndc-confgen.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/ddns-confgen.8 ${DESTDIR}${mandir}/man8
        (cd ${DESTDIR}${sbindir}; rm -f tsig-keygen@EXEEXT@; ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@)
+       (cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8

diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index 77adc91a11a6838d8f50589422723b1dfe0b5f7c..ea106f80632457fb0511c3d1496ac4149fce016d 100644 (file)
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -63,12 +63,10 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
-install-man1: delv.1
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-
-install:: delv@EXEEXT@ installdirs install-man1
+install:: delv@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
                delv@EXEEXT@ ${DESTDIR}${bindir}
+       ${INSTALL_DATA} ${srcdir}/delv.1 ${DESTDIR}${mandir}/man1
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man1/delv.1

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 52c8bae6284362e73e0e63ac30a630ddf9197548..c5990941242d38a59e0edb1fe9e937b242bbbe3d 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -93,16 +93,16 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
-install-man1: ${MANPAGES}
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-
-install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs install-man1
+install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
                dig@EXEEXT@ ${DESTDIR}${bindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
                host@EXEEXT@ ${DESTDIR}${bindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
                nslookup@EXEEXT@ ${DESTDIR}${bindir}
+       for m in ${MANPAGES}; do \
+               ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1; \
+               done
 
 uninstall::
        for m in ${MANPAGES}; do \

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index dc05146de7fc5b3d43b397f74558873f697749b9..b19fa0626a0a124f9fffc7d8bf5f72c43230db19 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -114,11 +114,9 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install-man8: ${MANPAGES}
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-install:: ${TARGETS} installdirs install-man8
+install:: ${TARGETS} installdirs
        for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done
+       for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
 
 uninstall::
        for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index e93f653fcd5463e1c7d8d94d078774f9cf0107f4..3b20df73463546448080e319a6ebca1f80180cfe 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -165,16 +165,10 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install-man5: named.conf.5
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
-
-install-man8: named.8
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-install-man: install-man5 install-man8
-
-install:: named@EXEEXT@ installdirs install-man
+install:: named@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
+       ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man5/named.conf.5

diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index 96aec05cca30892cf95b4c0b434e03dad27f8712..2fd986168dbc23a61e7264d2573c3e00ee6f7696 100644 (file)
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -69,10 +69,7 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install-man8: ${MANPAGES}
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-install:: ${TARGETS} installdirs install-man8
+install:: ${TARGETS} installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-list@EXEEXT@ \
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-destroy@EXEEXT@ \
@@ -81,6 +78,10 @@ install:: ${TARGETS} installdirs install-man8
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-tokens@EXEEXT@ \
                ${DESTDIR}${sbindir}
+       ${INSTALL_DATA} ${srcdir}/pkcs11-list.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/pkcs11-destroy.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/pkcs11-keygen.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/pkcs11-tokens.8 ${DESTDIR}${mandir}/man8
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man8/pkcs11-tokens.8

diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index 064c404e2fec35a8287852b762fe1b9db8a3180e..aa678d47abbdd31daeb29cae940f8347d67c964c 100644 (file)
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -47,13 +47,13 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install-man8: ${MANPAGES}
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-install:: ${TARGETS} installdirs install-man8
+install:: ${TARGETS} installdirs
        ${INSTALL_SCRIPT} dnssec-checkds ${DESTDIR}${sbindir}
        ${INSTALL_SCRIPT} dnssec-coverage ${DESTDIR}${sbindir}
        ${INSTALL_SCRIPT} dnssec-keymgr ${DESTDIR}${sbindir}
+       ${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8
        if test -n "${PYTHON}" ; then \
                if test -n "${DESTDIR}" ; then \
                        ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 3c4f028432dc075a8fbf41f0cf0693fa4e33a627..0fd28471d9344ab250dac8a979f55cec24927be6 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -107,27 +107,17 @@ installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-nzd-man: named-nzd2nzf.8
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-nzd: nzd-man
+nzd:
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-nzd2nzf@EXEEXT@ \
                ${DESTDIR}${sbindir}
+       ${INSTALL_DATA} ${srcdir}/named-nzd2nzf.8 ${DESTDIR}${mandir}/man8
 
-dnstap-man: dnstap-read.1
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-
-dnstap: dnstap-man
+dnstap:
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} dnstap-read@EXEEXT@ \
                ${DESTDIR}${bindir}
+       ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
 
-install-man1: arpaname.1 named-rrchecker.1 mdig.1
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-
-install-man8: named-journalprint.8 nsec3hash.8
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ install-man1 install-man8
+install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
                ${DESTDIR}${bindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
@@ -138,6 +128,11 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ install-man1 install-man8
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
                ${DESTDIR}${bindir}
+       ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
+       ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
+       ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man1/mdig.1