aboutsummaryrefslogtreecommitdiff
path: root/lib/bind
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2004-09-24 21:30:54 +0000
committerDoug Barton <dougb@FreeBSD.org>2004-09-24 21:30:54 +0000
commit0279b4a104d86245f113a1fe7232c1bab41e49f7 (patch)
treecb0a0086fcbb0219ec302053bbc1755f93d2a3ce /lib/bind
parent360048a7efac26b384fdaac7f5ae42cca87a0620 (diff)
downloadsrc-0279b4a104d86245f113a1fe7232c1bab41e49f7.tar.gz
src-0279b4a104d86245f113a1fe7232c1bab41e49f7.zip
Ruslan has educated me both on the wisdom of why this approach is
better than mine, and why to wait for review. Submitted by: ru
Notes
Notes: svn path=/head/; revision=135767
Diffstat (limited to 'lib/bind')
-rw-r--r--lib/bind/lwres/Makefile15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index f8dafdf285c1..a284df0c1c2f 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -5,6 +5,11 @@ LIB_BIND_REL= ..
LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
SRCDIR= ${BIND_DIR}/lib/lwres
+# Unlike other BIND libs, this should be installed unless the user says NO.
+.if !defined(NO_BIND_LIBS_LWRES)
+WITH_BIND_LIBS= YES
+.endif
+
.include "${LIB_BIND_DIR}/config.mk"
LIB= lwres
@@ -22,14 +27,7 @@ CFLAGS+= -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
-# Unlike other BIND libs, this should be installed unless the user says NO.
-.if !defined(NO_BIND)
-.if !defined(NO_BIND_LIBS_LWRES)
-.undef INTERNALLIB
-
-SHLIB_MAJOR= ${LIBINTERFACE}
-SHLIB_MINOR= ${LIBINTERFACE}
-
+.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/lwres/context.h \
${SRCDIR}/include/lwres/int.h \
${SRCDIR}/include/lwres/ipv6.h \
@@ -46,6 +44,5 @@ INCS= ${SRCDIR}/include/lwres/context.h \
INCSDIR= ${INCLUDEDIR}/lwres
.endif
-.endif
.include <bsd.lib.mk>