From 5887a0ecf4a9e57176e0f270ef586dc13d52bf3c Mon Sep 17 00:00:00 2001 From: dougb Date: Sun, 26 Sep 2004 06:36:11 +0000 Subject: Fix up the man file installation for the new BIND 9 sources: 1. Install man files and links for the lwres library. 2. Fix the path in various files to say /etc/namedb/ instead of just /etc. 3. Correctly install the conf file man pages for named and rndc. --- lib/bind/lwres/Makefile | 77 ++++++++++++++++++++++++++++++++++++++- usr.bin/nsupdate/Makefile | 2 + usr.sbin/named-checkconf/Makefile | 2 + usr.sbin/named/Makefile | 5 ++- usr.sbin/rndc-confgen/Makefile | 4 ++ usr.sbin/rndc/Makefile | 6 ++- 6 files changed, 93 insertions(+), 3 deletions(-) diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile index a284df0..81375c7 100644 --- a/lib/bind/lwres/Makefile +++ b/lib/bind/lwres/Makefile @@ -14,7 +14,7 @@ WITH_BIND_LIBS= YES LIB= lwres -.PATH: ${SRCDIR} +.PATH: ${SRCDIR} ${SRCDIR}/man SRCS+= context.c gai_strerror.c getaddrinfo.c gethost.c \ getipnode.c getnameinfo.c getrrset.c herror.c \ lwbuffer.c lwconfig.c lwpacket.c lwresutil.c \ @@ -28,6 +28,81 @@ DPADD= ${PTHREAD_DPADD} LDADD= ${PTHREAD_LDADD} .if defined(WITH_BIND_LIBS) +MAN= lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \ + lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \ + lwres_gethostent.3 lwres_getipnode.3 lwres_getnameinfo.3 \ + lwres_getrrsetbyname.3 lwres_gnba.3 lwres_hstrerror.3 \ + lwres_inetntop.3 lwres_noop.3 lwres_packet.3 lwres_resutil.3 + +MLINKS= lwres_buffer.3 lwres_buffer_add.3 \ + lwres_buffer.3 lwres_buffer_back.3 \ + lwres_buffer.3 lwres_buffer_clear.3 \ + lwres_buffer.3 lwres_buffer_first.3 \ + lwres_buffer.3 lwres_buffer_forward.3 \ + lwres_buffer.3 lwres_buffer_getmem.3 \ + lwres_buffer.3 lwres_buffer_getuint16.3 \ + lwres_buffer.3 lwres_buffer_getuint32.3 \ + lwres_buffer.3 lwres_buffer_getuint8.3 \ + lwres_buffer.3 lwres_buffer_init.3 \ + lwres_buffer.3 lwres_buffer_invalidate.3 \ + lwres_buffer.3 lwres_buffer_putmem.3 \ + lwres_buffer.3 lwres_buffer_putuint16.3 \ + lwres_buffer.3 lwres_buffer_putuint32.3 \ + lwres_buffer.3 lwres_buffer_putuint8.3 \ + lwres_buffer.3 lwres_buffer_subtract.3 \ + lwres_config.3 lwres_conf_clear.3 \ + lwres_config.3 lwres_conf_get.3 \ + lwres_config.3 lwres_conf_init.3 \ + lwres_config.3 lwres_conf_parse.3 \ + lwres_config.3 lwres_conf_print.3 \ + lwres_context.3 lwres_context_allocmem.3 \ + lwres_context.3 lwres_context_create.3 \ + lwres_context.3 lwres_context_destroy.3 \ + lwres_context.3 lwres_context_freemem.3 \ + lwres_context.3 lwres_context_initserial.3 \ + lwres_context.3 lwres_context_nextserial.3 \ + lwres_context.3 lwres_context_sendrecv.3 \ + lwres_gabn.3 lwres_gabnrequest_free.3 \ + lwres_gabn.3 lwres_gabnrequest_parse.3 \ + lwres_gabn.3 lwres_gabnrequest_render.3 \ + lwres_gabn.3 lwres_gabnresponse_free.3 \ + lwres_gabn.3 lwres_gabnresponse_parse.3 \ + lwres_gabn.3 lwres_gabnresponse_render.3 \ + lwres_getaddrinfo.3 lwres_freeaddrinfo.3 \ + lwres_gethostent.3 lwres_endhostent.3 \ + lwres_gethostent.3 lwres_endhostent_r.3 \ + lwres_gethostent.3 lwres_gethostbyaddr.3 \ + lwres_gethostent.3 lwres_gethostbyaddr_r.3 \ + lwres_gethostent.3 lwres_gethostbyname.3 \ + lwres_gethostent.3 lwres_gethostbyname2.3 \ + lwres_gethostent.3 lwres_gethostbyname_r.3 \ + lwres_gethostent.3 lwres_gethostent_r.3 \ + lwres_gethostent.3 lwres_sethostent.3 \ + lwres_gethostent.3 lwres_sethostent_r.3 \ + lwres_getipnode.3 lwres_freehostent.3 \ + lwres_getipnode.3 lwres_getipnodebyaddr.3 \ + lwres_getipnode.3 lwres_getipnodebyname.3 \ + lwres_gnba.3 lwres_gnbarequest_free.3 \ + lwres_gnba.3 lwres_gnbarequest_parse.3 \ + lwres_gnba.3 lwres_gnbarequest_render.3 \ + lwres_gnba.3 lwres_gnbaresponse_free.3 \ + lwres_gnba.3 lwres_gnbaresponse_parse.3 \ + lwres_gnba.3 lwres_gnbaresponse_render.3 \ + lwres_hstrerror.3 lwres_herror.3 \ + lwres_inetntop.3 lwres_net_ntop.3 \ + lwres_noop.3 lwres_nooprequest_free.3 \ + lwres_noop.3 lwres_nooprequest_parse.3 \ + lwres_noop.3 lwres_nooprequest_render.3 \ + lwres_noop.3 lwres_noopresponse_free.3 \ + lwres_noop.3 lwres_noopresponse_parse.3 \ + lwres_noop.3 lwres_noopresponse_render.3 \ + lwres_packet.3 lwres_lwpacket_parseheader.3 \ + lwres_packet.3 lwres_lwpacket_renderheader.3 \ + lwres_resutil.3 lwres_addr_parse.3 \ + lwres_resutil.3 lwres_getaddrsbyname.3 \ + lwres_resutil.3 lwres_getnamebyaddr.3 \ + lwres_resutil.3 lwres_string_parse.3 + INCS= ${SRCDIR}/include/lwres/context.h \ ${SRCDIR}/include/lwres/int.h \ ${SRCDIR}/include/lwres/ipv6.h \ diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile index b8bd758..ea01287 100644 --- a/usr.bin/nsupdate/Makefile +++ b/usr.bin/nsupdate/Makefile @@ -19,4 +19,6 @@ LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= nsupdate.8 +MANFILTER= sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" + .include diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile index 6a48669..8728b4a 100644 --- a/usr.sbin/named-checkconf/Makefile +++ b/usr.sbin/named-checkconf/Makefile @@ -19,4 +19,6 @@ LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= named-checkconf.8 +MANFILTER= sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" + .include diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 820b7fd..d061544 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -27,7 +27,10 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} -MAN= named.8 lwresd.8 named.conf.5 +MAN5= named.conf.5 +MAN8= named.8 lwresd.8 + +MANFILTER= sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" LINKS= ${BINDIR}/named ${BINDIR}/lwresd diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile index ab5b379..b8a52dd 100644 --- a/usr.sbin/rndc-confgen/Makefile +++ b/usr.sbin/rndc-confgen/Makefile @@ -22,4 +22,8 @@ LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= rndc-confgen.8 +MANFILTER= sed -e 's@fI/etc\\fR.*@fI/etc/namedb\\fR@' \ + -e '/^sysconfdir$$/d' \ + -e '/was specified as when BIND was built)/d' + .include diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile index d236b5d..c411122 100644 --- a/usr.sbin/rndc/Makefile +++ b/usr.sbin/rndc/Makefile @@ -20,6 +20,10 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} -MAN= rndc.8 rndc.conf.5 +MAN5= rndc.conf.5 +MAN8= rndc.8 + +MANFILTER= sed -e "s@/etc/rndc\.conf@/etc/namedb/rndc.conf@g" \ + -e "s@/etc/rndc\.key@/etc/namedb/rndc.key@g" .include -- cgit v1.1