From 01b8865b1462ba219c90cf6c00f1bf0fdf780d9b Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Thu, 18 Jan 2001 01:33:54 +0000
Subject: [PATCH]  689.   [doc]           man pages are now installed. [RT
 #210]

---
 CHANGES                  |  2 ++
 bin/check/Makefile.in    |  8 ++++++--
 bin/dig/Makefile.in      |  6 +++++-
 bin/dnssec/Makefile.in   |  9 ++++++++-
 bin/named/Makefile.in    |  6 +++++-
 bin/nsupdate/Makefile.in |  8 ++++++--
 bin/rndc/Makefile.in     | 10 ++++++++--
 make/rules.in            |  3 ++-
 8 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2d729c5e3b..f9691b45df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 689.	[doc]		man pages are now installed. [RT #210]
+
  688.	[func]		"make tags" now works on systems with the
 			"Exuberant Ctags" etags.
 
diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index d19245b96a..1bff11d385 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2001/01/09 21:39:06 bwelling Exp $
+# $Id: Makefile.in,v 1.7 2001/01/18 01:33:46 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -42,6 +42,8 @@ TARGETS =	named-checkconf named-checkzone
 # Alphabetically
 SRCS =		named-checkconf.c named-checkzone.c check-tool.c
 
+MANPAGES =	named-checkconf.8 named-checkzone.8
+
 @BIND9_MAKE_RULES@
 
 named-checkconf: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
@@ -57,7 +59,9 @@ clean distclean::
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install:: named-checkconf named-checkzone
+install:: named-checkconf named-checkzone installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} named-checkconf ${DESTDIR}${sbindir}
 	${LIBTOOL} ${INSTALL_PROGRAM} named-checkzone ${DESTDIR}${sbindir}
+	for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man8; done
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 79c64c6562..9e210b497f 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.18 2001/01/09 21:39:12 bwelling Exp $
+# $Id: Makefile.in,v 1.19 2001/01/18 01:33:48 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -48,6 +48,8 @@ UOBJS =
 
 SRCS =		dig.c dighost.c host.c nslookup.c
 
+MANPAGES =	dig.1 host.1
+
 @BIND9_MAKE_RULES@
 
 dig: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
@@ -64,8 +66,10 @@ clean distclean::
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
 install:: dig host nslookup installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} dig ${DESTDIR}${bindir}
 	${LIBTOOL} ${INSTALL_PROGRAM} host ${DESTDIR}${bindir}
 	${LIBTOOL} ${INSTALL_PROGRAM} nslookup ${DESTDIR}${bindir}
+	for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man1; done
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index e2e3f1d199..9430391247 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2001/01/09 21:39:21 bwelling Exp $
+# $Id: Makefile.in,v 1.15 2001/01/18 01:33:49 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -50,6 +50,11 @@ SRCS =		dnssec-keygen.c dnssec-makekeyset.c \
 		dnssec-signkey.c dnssec-signzone.c \
 		dnssectool.c
 
+MANPAGES =	dnssec-keygen.8 \
+		dnssec-makekeyset.8 \
+		dnssec-signkey.8 \
+		dnssec-signzone.8
+
 @BIND9_MAKE_RULES@
 
 dnssec-keygen: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
@@ -72,6 +77,8 @@ clean distclean::
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: ${TARGETS} installdirs
 	for t in ${TARGETS}; do ${LIBTOOL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done
+	for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man8; done
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index d5f0b6a8f0..51ab78d295 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.64 2001/01/09 21:39:38 bwelling Exp $
+# $Id: Makefile.in,v 1.65 2001/01/18 01:33:50 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -77,6 +77,8 @@ SRCS =		aclconf.c client.c interfacemgr.c listenlist.c \
 		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
 		$(DBDRIVER_SRCS)
 
+MANPAGES =	named.8 lwresd.8
+
 @BIND9_MAKE_RULES@
 
 main.@O@: main.c
@@ -96,7 +98,9 @@ clean distclean::
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: named lwresd installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} named ${DESTDIR}${sbindir}
 	(cd ${DESTDIR}${sbindir}; rm -f lwresd; @LN@ named lwresd)
+	for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man8; done
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index afc4c98f40..6ffe82e124 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2001/01/09 21:40:41 bwelling Exp $
+# $Id: Makefile.in,v 1.11 2001/01/18 01:33:51 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -50,6 +50,8 @@ UOBJS =
 
 SRCS =		nsupdate.c
 
+MANPAGES =	nsupdate.8
+
 @BIND9_MAKE_RULES@
 
 nsupdate: nsupdate.@O@ ${UOBJS} ${DEPLIBS}
@@ -60,6 +62,8 @@ clean distclean::
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install:: nsupdate
+install:: nsupdate installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} nsupdate ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} nsupdate.8 ${DESTDIR}${mandir}/man8
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index e7dce5f021..49c487d547 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.15 2001/01/09 21:40:43 bwelling Exp $
+# $Id: Makefile.in,v 1.16 2001/01/18 01:33:53 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -47,6 +47,8 @@ OBJS =		rndc.@O@
 
 SRCS =		rndc.c
 
+MANPAGES =	rndc.8 rndc.conf.5
+
 @BIND9_MAKE_RULES@
 
 rndc.@O@: rndc.c
@@ -58,9 +60,13 @@ rndc: ${OBJS} ${DEPLIBS}
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
 
-install:: rndc
+install:: rndc installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} rndc ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} rndc.8 ${DESTDIR}${mandir}/man8
+	${INSTALL_PROGRAM} rndc.conf.5 ${DESTDIR}${mandir}/man5
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/make/rules.in b/make/rules.in
index 2000baff3c..e49f2841f8 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.26 2001/01/09 22:00:44 bwelling Exp $
+# $Id: rules.in,v 1.27 2001/01/18 01:33:54 bwelling Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -33,6 +33,7 @@ includedir =	@includedir@
 libdir =	@libdir@
 sysconfdir =	@sysconfdir@
 localstatedir =	@localstatedir@
+mandir =	@mandir@
 
 DESTDIR =