Changed ``defined(KERBEROS)'' to ``(${KERBEROS} == "yes")''

Same change doen for SKEY, YP, and KERBEROS5.  This allows
people to override those setting in /etc/mk.conf.

2 files changed, 6 insertions, 6 deletions

diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index f92ce182cdc..0ac6c273f3c 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.21 1996/10/18 04:34:47 tholo Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.22 1997/04/19 21:26:13 millert Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@ CLEANFILES=	lib/getdate.c macintosh/Makefile os2/Makefile doc/CVSvn.texi \
                 doc/cvs.info doc/cvs.info-1 doc/cvs.info-2 doc/cvs.info-3 \
                 doc/cvs.info-4 doc/cvs.info-5 doc/cvs.info-6 doc/cvsclient.info
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 KRB=--with-krb4=/usr
 .else
 KRB=--without-krb4
diff --git a/gnu/usr.bin/sudo/sudo/Makefile b/gnu/usr.bin/sudo/sudo/Makefile
index c0a198ff687..04721f883aa 100644
--- a/gnu/usr.bin/sudo/sudo/Makefile
+++ b/gnu/usr.bin/sudo/sudo/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.3 1997/03/18 20:48:46 maja Exp $
+#       $OpenBSD: Makefile,v 1.4 1997/04/19 21:26:13 millert Exp $
 
 PROG=	sudo
 MAN=	sudo.8 sudoers.5
@@ -11,17 +11,17 @@ DPADD=  ${LIBCOMPAT}
 
 .include <bsd.own.mk>   # For SKEY, KERBEROS and KERBEROS5
 
-.if defined(SKEY)
+.if (${SKEY} == "yes")
 CFLAGS+=-DHAVE_SKEY
 LDADD+= -lskey
 DPADD+= ${LIBSKEY}
 .endif
 
-.if defined(KERBEROS5)
+.if (${KERBEROS5} == "yes")
 CFLAGS+= -DHAVE_KERB5 -I${DESTDIR}/usr/include/kerberosIV
 LDADD+= -lkrb5 -lcrypto
 DPADD+= ${LIBKRB5} ${LIBCRYPTO}
-.elif defined(KERBEROS)
+.elif (${KERBEROS} == "yes")
 CFLAGS+= -DHAVE_KERB4 -I${DESTDIR}/usr/include/kerberosIV
 LDADD+= -lkrb -ldes
 DPADD+= ${LIBKRB} ${LIBDES}