diff options
author | dougb <dougb@FreeBSD.org> | 2004-09-26 06:36:11 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2004-09-26 06:36:11 +0000 |
commit | 5887a0ecf4a9e57176e0f270ef586dc13d52bf3c (patch) | |
tree | fc86b12eadcff44c948ecbc085153e61681ac554 /usr.sbin | |
parent | b10a387be5ebb75e825368b1d46b14ceab509524 (diff) | |
download | FreeBSD-src-5887a0ecf4a9e57176e0f270ef586dc13d52bf3c.zip FreeBSD-src-5887a0ecf4a9e57176e0f270ef586dc13d52bf3c.tar.gz |
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.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/named-checkconf/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/named/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/rndc-confgen/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/rndc/Makefile | 6 |
4 files changed, 15 insertions, 2 deletions
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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <bsd.prog.mk> |