From 56216f685b9a1d374e63cb315b6fa427c0c29852 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 24 Sep 2004 13:42:00 +0000 Subject: Don't expose BIND libraries and their headers to the public by default, but have a knob (WANT_BIND_LIBS) to build and install them in /usr/lib and /usr/include. Rumors are that this may be useful at a later point, let's see. What this really means is that all BIND libraries are now internal to buildworld (by default, unless WANT_BIND_LIBS is defined), and linked statically into various BIND executables. While here, removed redundant -I's from CFLAGS in lib/bind makefiles. Sponsored by: des OK'ed by: dougb --- usr.sbin/dnssec-keygen/Makefile | 3 ++- usr.sbin/dnssec-signzone/Makefile | 3 ++- usr.sbin/named-checkconf/Makefile | 3 ++- usr.sbin/named-checkzone/Makefile | 3 ++- usr.sbin/named/Makefile | 3 ++- usr.sbin/rndc-confgen/Makefile | 3 ++- usr.sbin/rndc/Makefile | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile index 0c357dfc0a85..3ac90058106d 100644 --- a/usr.sbin/dnssec-keygen/Makefile +++ b/usr.sbin/dnssec-keygen/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/dnssec .include "${LIB_BIND_DIR}/config.mk" diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile index c8dd6a946759..7c4ca65a78cc 100644 --- a/usr.sbin/dnssec-signzone/Makefile +++ b/usr.sbin/dnssec-signzone/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/dnssec .include "${LIB_BIND_DIR}/config.mk" diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile index a478ba038284..6a486699a9b4 100644 --- a/usr.sbin/named-checkconf/Makefile +++ b/usr.sbin/named-checkconf/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/check .include "${LIB_BIND_DIR}/config.mk" diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile index 0531457aa62f..39384e52a237 100644 --- a/usr.sbin/named-checkzone/Makefile +++ b/usr.sbin/named-checkzone/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/check .include "${LIB_BIND_DIR}/config.mk" diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 12c7c8f8787f..820b7fda773a 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/named .include "${LIB_BIND_DIR}/config.mk" diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile index e69cb46b908d..ab5b379325a6 100644 --- a/usr.sbin/rndc-confgen/Makefile +++ b/usr.sbin/rndc-confgen/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/rndc .include "${LIB_BIND_DIR}/config.mk" diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile index 0fd49c15f1a0..d236b5dcba56 100644 --- a/usr.sbin/rndc/Makefile +++ b/usr.sbin/rndc/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ BIND_DIR= ${.CURDIR}/../../contrib/bind9 -LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/bin/rndc .include "${LIB_BIND_DIR}/config.mk" -- cgit v1.2.3