Revert "Use make automatic variables to install updated manuals"

This reverts commit 77e9d82e1ffa25e667ded6dc0e917b893f987f15.

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 65b90caa6094f96e96f2af8daf49e97aa2478061..12f48d2d23d1563866d0366f121464018bd87140 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -7,6 +7,8 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
+
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -81,14 +83,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 974fa3b7e63f7d15f04f5cedd328bc345a9afdb0..87f13dda4b808137719ed88f595e0eb331fd9bd3 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -7,6 +7,8 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+# $Id: Makefile.in,v 1.8 2009/12/05 23:31:40 each Exp $
+
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -93,14 +95,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 19361a83ea475098b2775f4e413bd0cbf2c20647..e2d2802262f635b205a5fc15251b62b8acaf589d 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 3edd951e7e9bf7aab60fe1351b0e9ee488c7b35e..773ac463951d746c7327db39a126598d2da74c97 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -91,16 +91,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 ed5b1a42f3fb031da8f4a7bad8e17993a9a7788b..1be1d5ffc6b6a9da15e5ef0001b11524a925868d 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -7,6 +7,8 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+# $Id: Makefile.in,v 1.42.332.1 2011/03/16 06:37:51 each Exp $
+
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -108,11 +110,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 44ad0b5424726bc59e7f9fd4170a310dd2e00f55..1c413973d066b580c7d04f58ec85f174525849e7 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -172,17 +172,12 @@ 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: lwresd.8 named.8
-       ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-
-install-man: install-man5 install-man8
-
-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
+install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
        (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
+       ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/lwresd.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 103a3b54cd041350ea648d5c69297327ac890852..ae9061626cabbeb156cfa104f1d5f088abf86334 100644 (file)
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -7,6 +7,8 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+# $Id: Makefile.in,v 1.2 2009/10/05 12:07:08 fdupont Exp $
+
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -69,10 +71,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 +80,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 7fc679f445035a157c99a7aaf4214b21500c57c2..7bf2af4cea5f4a68b7cc92b4f911a6df2feb079b 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -119,27 +119,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: genrandom.8 isc-hmac-fixup.8 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@ \
@@ -154,6 +144,13 @@ 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}/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}/nsec3hash.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
+       ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
 
 uninstall::
        rm -f ${DESTDIR}${mandir}/man1/mdig.1