diff options
| author | itojun <itojun@NetBSD.org> | 2001-05-27 04:08:04 +0000 |
|---|---|---|
| committer | itojun <itojun@NetBSD.org> | 2001-05-27 04:08:04 +0000 |
| commit | 840fe8eadc04fc2dcaa60fdaaa9be573fe160ed3 (patch) | |
| tree | 03f5c583191f0c5e17a10f3d499d9169df845da0 | |
| parent | cbfe1747378524df63e1ed5244f36719b8a91c04 (diff) | |
put -NOESW to version number if MKCRYPTO != yes, to sync better with original
BIND8 makefiles.
| -rw-r--r-- | usr.sbin/bind/Makefile.inc | 9 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/Makefile | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/usr.sbin/bind/Makefile.inc b/usr.sbin/bind/Makefile.inc index dfe6c767431..8fc0ec722e9 100644 --- a/usr.sbin/bind/Makefile.inc +++ b/usr.sbin/bind/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2001/02/11 06:45:59 itojun Exp $ +# $NetBSD: Makefile.inc,v 1.11 2001/05/27 04:08:04 itojun Exp $ .include <bsd.own.mk> @@ -8,7 +8,12 @@ BIND_DIR= ${.CURDIR}/.. BIND_DIST_DIR= ${.CURDIR}/../../../dist/bind BIND_CRYPTO_DIST_DIR= ${.CURDIR}/../../../crypto/dist/bind -VER!= cat ${BIND_DIST_DIR}/Version +VER0!= cat ${BIND_DIST_DIR}/Version +.if ${MKCRYPTO} == "yes" +VER= ${VER0} +.else +VER= ${VER0}-NOESW +.endif NAMED= named PIDFILE= /var/run/named.pid diff --git a/usr.sbin/bind/lib/Makefile b/usr.sbin/bind/lib/Makefile index 62e2e1973b9..5ab63521204 100644 --- a/usr.sbin/bind/lib/Makefile +++ b/usr.sbin/bind/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/05/17 22:59:37 itojun Exp $ +# $NetBSD: Makefile,v 1.16 2001/05/27 04:08:05 itojun Exp $ .include <bsd.own.mk> @@ -11,7 +11,8 @@ MKLINT=no CPPFLAGS+= ${INCLUDE} -I${BIND_DIST_DIR}/lib/dst \ -DHMAC_MD5 -DUSE_MD5 .if ${MKCRYPTO} == "yes" -CPPFLAGS+= -I${BIND_CRYPTO_DIST_DIR}/lib/dnssafe -DDNSSAFE +CPPFLAGS+= -I${BIND_CRYPTO_DIST_DIR}/lib/dnssafe -DDNSSAFE \ + -I${BIND_CRYPTO_DIST_DIR}/lib/cylink -DCYLINK_DSS .endif .include "${.CURDIR}/../Makefile.inc" @@ -62,6 +63,7 @@ SRCS+= dns.c dns_gr.c dns_ho.c dns_nw.c dns_pr.c dns_pw.c \ nis_sv.c nul_ng.c util.c # ${BIND_DIST_DIR}/lib/bsd SRCS+= gettimeofday.c +.if ${MKCRYPTO} == "yes" # ${BIND_DIST_DIR}/lib/cylink SRCS+= bn.c bn00.c lbn00.c lbnmem.c legal.c \ bits.c dss.c math.c ctk_prime.c rand.c sha.c swap.c @@ -85,7 +87,7 @@ SRCS+= bgclrbit.c bgmdmpyx.c bgmdsqx.c bgmodexp.c\ digest.c encrypt.c generate.c intitem.c\ keyobj.c ki8byte.c kiitem.c kinfotyp.c\ kifulprv.c kipkcrpr.c kirsacrt.c kirsapub.c random.c - +.endif .if ${MACHINE_ARCH} == "sparc64" sha.o: sha.c |
