aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/bind/bind/Makefile12
-rw-r--r--lib/bind/bind9/Makefile7
-rw-r--r--lib/bind/config.mk33
-rw-r--r--lib/bind/dns/Makefile7
-rw-r--r--lib/bind/isc/Makefile7
-rw-r--r--lib/bind/isccc/Makefile7
-rw-r--r--lib/bind/isccfg/Makefile7
-rw-r--r--lib/bind/lwres/Makefile7
-rw-r--r--share/mk/bsd.libnames.mk6
-rw-r--r--usr.bin/dig/Makefile3
-rw-r--r--usr.bin/host/Makefile3
-rw-r--r--usr.bin/nslookup/Makefile3
-rw-r--r--usr.bin/nsupdate/Makefile3
-rw-r--r--usr.sbin/dnssec-keygen/Makefile3
-rw-r--r--usr.sbin/dnssec-signzone/Makefile3
-rw-r--r--usr.sbin/named-checkconf/Makefile3
-rw-r--r--usr.sbin/named-checkzone/Makefile3
-rw-r--r--usr.sbin/named/Makefile3
-rw-r--r--usr.sbin/rndc-confgen/Makefile3
-rw-r--r--usr.sbin/rndc/Makefile3
20 files changed, 94 insertions, 32 deletions
diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index 2297e2feee85..a00a3858a235 100644
--- a/lib/bind/bind/Makefile
+++ b/lib/bind/bind/Makefile
@@ -1,9 +1,14 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/bind
+# XXX These should come before -I's from config.mk.
+CFLAGS+= -I${SRCDIR}/port/freebsd/include -I${SRCDIR}/include
+CFLAGS+= -I${.CURDIR}
+
.include "${LIB_BIND_DIR}/config.mk"
LIB= bind
@@ -57,12 +62,10 @@ SRCS+= herror.c res_comp.c res_data.c \
res_mkquery.c res_mkupdate.c res_query.c \
res_send.c res_sendsigned.c res_update.c
-CFLAGS+= -I${SRCDIR}/port/freebsd/include -I${SRCDIR}/include
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
-
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
+#.if defined(WANT_BIND_LIBS)
#INCS= ${SRCDIR}/include/isc/assertions.h \
# ${SRCDIR}/include/isc/ctl.h \
# ${SRCDIR}/include/isc/dst.h \
@@ -76,5 +79,6 @@ LDADD= ${PTHREAD_LDADD}
# ${SRCDIR}/include/isc/tree.h
#
#INCSDIR= ${INCLUDEDIR}/isc
+#.endif
.include <bsd.lib.mk>
diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile
index 73fc1f18ca88..7085a93ffa31 100644
--- a/lib/bind/bind9/Makefile
+++ b/lib/bind/bind9/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/bind9
.include "${LIB_BIND_DIR}/config.mk"
@@ -11,15 +12,17 @@ LIB= bind9
.PATH: ${SRCDIR}
SRCS= check.c getaddresses.c version.c
-CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${SRCDIR}/include
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
+.if defined(WANT_BIND_LIBS)
INCS= ${SRCDIR}/include/bind9/check.h \
${SRCDIR}/include/bind9/getaddresses.h \
${SRCDIR}/include/bind9/version.h
INCSDIR= ${INCLUDEDIR}/bind9
+.endif
.include <bsd.lib.mk>
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 23ba65e7a2b5..7968d90f3661 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -13,10 +13,14 @@ CFLAGS+= -DHAVE_CONFIG_H
.if defined(SRCDIR) && exists(${SRCDIR}/api)
.include "${SRCDIR}/api"
CFLAGS+= -DLIBINTERFACE=${LIBINTERFACE}
-SHLIB_MAJOR= ${LIBINTERFACE}
CFLAGS+= -DLIBREVISION=${LIBREVISION}
-SHLIB_MINOR= ${LIBINTERFACE}
CFLAGS+= -DLIBAGE=${LIBAGE}
+.if defined(WANT_BIND_LIBS)
+SHLIB_MAJOR= ${LIBINTERFACE}
+SHLIB_MINOR= ${LIBINTERFACE}
+.else
+INTERNALLIB= YES
+.endif
.endif
# GSSAPI support is incomplete in 9.3.0
@@ -57,9 +61,34 @@ CFLAGS+= -I${LIB_BIND_DIR}
.endif
# Link against BIND libraries
+.if !defined(WANT_BIND_LIBS)
+LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a
+CFLAGS+= -I${BIND_DIR}/lib/bind9/include
+LIBDNS= ${LIB_BIND_REL}/dns/libdns.a
+CFLAGS+= -I${BIND_DIR}/lib/dns/sec/dst/include \
+ -I${BIND_DIR}/lib/dns/include \
+ -I${LIB_BIND_DIR}/dns
+LIBISCCC= ${LIB_BIND_REL}/isccc/libisccc.a
+CFLAGS+= -I${BIND_DIR}/lib/isccc/include
+LIBISCCFG= ${LIB_BIND_REL}/isccfg/libisccfg.a
+CFLAGS+= -I${BIND_DIR}/lib/isccfg/include
+LIBISC= ${LIB_BIND_REL}/isc/libisc.a
+CFLAGS+= -I${BIND_DIR}/lib/isc/unix/include \
+ -I${BIND_DIR}/lib/isc/pthreads/include \
+ -I${BIND_DIR}/lib/isc/include \
+ -I${LIB_BIND_DIR}/isc
+LIBLWRES= ${LIB_BIND_REL}/lwres/liblwres.a
+CFLAGS+= -I${BIND_DIR}/lib/lwres/unix/include \
+ -I${BIND_DIR}/lib/lwres/include \
+ -I${LIB_BIND_DIR}/lwres
+.endif
BIND_DPADD= ${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
${LIBISC} ${LIBLWRES}
+.if defined(WANT_BIND_LIBS)
BIND_LDADD= -lbind9 -ldns -lisccc -lisccfg -lisc -llwres
+.else
+BIND_LDADD= ${BIND_DPADD}
+.endif
# Link against crypto library
.if !defined(NOCRYPT)
diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile
index 3a3d05655930..ea9a23070a04 100644
--- a/lib/bind/dns/Makefile
+++ b/lib/bind/dns/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/dns
.include "${LIB_BIND_DIR}/config.mk"
@@ -34,11 +35,12 @@ SRCS+= acl.c adb.c byaddr.c \
version.c view.c xfrin.c zone.c zonekey.c zt.c
CFLAGS+= -I${SRCDIR}/sec/dst/include -I${SRCDIR}/include -I${SRCDIR}
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${.CURDIR}
DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD}
LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+.if defined(WANT_BIND_LIBS)
DNSINCS= ${SRCDIR}/include/dns/acl.h \
${SRCDIR}/include/dns/adb.h \
${SRCDIR}/include/dns/bit.h \
@@ -121,6 +123,7 @@ DSTINCS= ${SRCDIR}/sec/dst/include/dst/dst.h \
DSTINCSDIR= ${INCLUDEDIR}/dst
INCSGROUPS= DNSINCS DSTINCS
+.endif
.if defined(MAINTAINER_MODE)
generate: ${.CURDIR}/dns/enumtype.h ${.CURDIR}/dns/enumclass.h \
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index 6fc1a1f487ef..512876975187 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/isc
.include "${LIB_BIND_DIR}/config.mk"
@@ -35,11 +36,12 @@ SRCS+= inet_pton.c \
symtab.c task.c taskpool.c timer.c version.c
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include
-CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${SRCDIR}/include -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
+.if defined(WANT_BIND_LIBS)
INCS= ${SRCDIR}/include/isc/app.h \
${SRCDIR}/include/isc/assertions.h \
${SRCDIR}/include/isc/base64.h \
@@ -120,5 +122,6 @@ INCS= ${SRCDIR}/include/isc/app.h \
isc/platform.h
INCSDIR= ${INCLUDEDIR}/isc
+.endif
.include <bsd.lib.mk>
diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile
index 9d3d1fe3a31d..d3b0d4fdb422 100644
--- a/lib/bind/isccc/Makefile
+++ b/lib/bind/isccc/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/isccc
.include "${LIB_BIND_DIR}/config.mk"
@@ -13,11 +14,12 @@ SRCS= alist.c base64.c cc.c ccmsg.c \
lib.c \
result.c sexpr.c symtab.c version.c
-CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${SRCDIR}/include
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
+.if defined(WANT_BIND_LIBS)
INCS= ${SRCDIR}/include/isccc/alist.h \
${SRCDIR}/include/isccc/base64.h \
${SRCDIR}/include/isccc/cc.h \
@@ -33,5 +35,6 @@ INCS= ${SRCDIR}/include/isccc/alist.h \
${SRCDIR}/include/isccc/version.h
INCSDIR= ${INCLUDEDIR}/isccc
+.endif
.include <bsd.lib.mk>
diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile
index b37a70000fb5..86adb54291c9 100644
--- a/lib/bind/isccfg/Makefile
+++ b/lib/bind/isccfg/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/isccfg
.include "${LIB_BIND_DIR}/config.mk"
@@ -11,11 +12,12 @@ LIB= isccfg
.PATH: ${SRCDIR}
SRCS= log.c namedconf.c parser.c version.c
-CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${SRCDIR}/include -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
+.if defined(WANT_BIND_LIBS)
INCS= ${SRCDIR}/include/isccfg/cfg.h \
${SRCDIR}/include/isccfg/grammar.h \
${SRCDIR}/include/isccfg/log.h \
@@ -23,5 +25,6 @@ INCS= ${SRCDIR}/include/isccfg/cfg.h \
${SRCDIR}/include/isccfg/version.h
INCSDIR= ${INCLUDEDIR}/isccfg
+.endif
.include <bsd.lib.mk>
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index c8594c65e0b5..2d3dccfebae1 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
-LIB_BIND_DIR= ${.CURDIR}/..
+LIB_BIND_REL= ..
+LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/lwres
.include "${LIB_BIND_DIR}/config.mk"
@@ -16,11 +17,12 @@ SRCS+= context.c gai_strerror.c getaddrinfo.c gethost.c \
lwinetaton.c lwinetpton.c lwinetntop.c print.c
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
+.if defined(WANT_BIND_LIBS)
INCS= ${SRCDIR}/include/lwres/context.h \
${SRCDIR}/include/lwres/int.h \
${SRCDIR}/include/lwres/ipv6.h \
@@ -36,5 +38,6 @@ INCS= ${SRCDIR}/include/lwres/context.h \
lwres/platform.h
INCSDIR= ${INCLUDEDIR}/lwres
+.endif
.include <bsd.lib.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 815a6bde5dcd..e627968edc17 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -14,7 +14,7 @@ LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
-.if !defined(NO_BIND)
+.if !defined(NO_BIND) && defined(WANT_BIND_LIBS)
LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a
LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a
.endif
@@ -52,7 +52,7 @@ LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a
LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a
LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a
LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a
-.if !defined(NO_BIND)
+.if !defined(NO_BIND) && defined(WANT_BIND_LIBS)
LIBISC?= ${DESTDIR}${LIBDIR}/libisc.a
LIBISCCC?= ${DESTDIR}${LIBDIR}/libisccc.a
LIBISCCFG?= ${DESTDIR}${LIBDIR}/libisccfg.a
@@ -66,7 +66,7 @@ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
LIBL?= ${DESTDIR}${LIBDIR}/libl.a
LIBLN?= "don't use LIBLN, use LIBL"
-.if !defined(NO_BIND)
+.if !defined(NO_BIND) && defined(WANT_BIND_LIBS)
LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
.endif
LIBM?= ${DESTDIR}${LIBDIR}/libm.a
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 0d5b4ca7d1ce..2f52015460d5 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/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/dig
.include "${LIB_BIND_DIR}/config.mk"
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index e3a034d66bcd..e39b93c5f28a 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/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/dig
.include "${LIB_BIND_DIR}/config.mk"
diff --git a/usr.bin/nslookup/Makefile b/usr.bin/nslookup/Makefile
index e59c71459d9b..ca28c448f391 100644
--- a/usr.bin/nslookup/Makefile
+++ b/usr.bin/nslookup/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/dig
.include "${LIB_BIND_DIR}/config.mk"
diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile
index 8612a0d20464..b8bd75881748 100644
--- a/usr.bin/nsupdate/Makefile
+++ b/usr.bin/nsupdate/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/nsupdate
.include "${LIB_BIND_DIR}/config.mk"
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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 18:06:28 +0000