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.

27 files changed, 80 insertions, 79 deletions

diff --git a/Makefile b/Makefile
index 195076a1d7a..6ecff842358 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 1997/04/18 06:47:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 1997/04/19 21:26:09 millert Exp $
 #	$NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $
 
 #
@@ -28,7 +28,7 @@ SUBDIR+= gnu
 
 SUBDIR+= sys lkm
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 SUBDIR+= kerberosIV
 .endif
 
@@ -67,7 +67,7 @@ build:
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 	(cd ${.CURDIR}/kerberosIV && ${MAKE} build)
 .endif
 	${MAKE} depend && ${MAKE} && ${MAKE} install
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 2a98263e8b9..81fcb914473 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/23 14:20:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/04/19 21:26:10 millert Exp $
 #	$NetBSD: Makefile,v 1.6 1995/03/23 08:46:35 mycroft Exp $
 
 PROG=	rcp
@@ -9,7 +9,7 @@ BINMODE=4555
 
 .include <bsd.own.mk>	# For KERBEROS
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 .PATH:	${.CURDIR}/../../usr.bin/rlogin
 SRCS+=	krcmd.c kcmd.c
 CFLAGS+=-DKERBEROS
diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc
index 83311afb00f..e5e12e77e87 100644
--- a/distrib/i386/floppies/common/Makefile.inc
+++ b/distrib/i386/floppies/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1997/04/17 02:10:31 niklas Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1997/04/19 21:26:11 millert Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -15,7 +15,7 @@ REALIMAGE=	/tmp/image.${PID}
 MDEC=		${DESTDIR}/usr/mdec
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 CRUNCHCONF=	${COMMONDIR}/${CBIN}-krb.conf
 .else
 CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
@@ -58,7 +58,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 	mv ${CBIN}-krb ${CBIN}
 .endif
 
diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc
index db250a9e23e..824ccd6ae32 100644
--- a/distrib/sparc/floppies/inst-common/Makefile.inc
+++ b/distrib/sparc/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.5 1997/03/31 07:36:05 deraadt Exp $
+#	$Id: Makefile.inc,v 1.6 1997/04/19 21:26:12 millert Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -15,7 +15,7 @@ IMAGE?=		inst${REV}.fs
 MDEC=		${DESTDIR}/usr/mdec
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 CRUNCHCONF=	${COMMONDIR}/${CBIN}-krb.conf
 .else
 CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
@@ -49,7 +49,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 	mv ${CBIN}-krb ${CBIN}
 .endif
 
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}
diff --git a/include/Makefile b/include/Makefile
index 6c6ec1dedaf..f3b9ba4d9ba 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.38 1997/02/27 18:14:50 downsj Exp $
+#	$OpenBSD: Makefile,v 1.39 1997/04/19 21:26:15 millert Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -44,7 +44,7 @@ NOOBJ=	noobj
 # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies
 .include <bsd.own.mk>
 SYS_INCLUDE?=	copies
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 RDIRS+=	../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb
 .endif
 
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 54fb044282b..9696cdb9f23 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 1996/12/08 15:22:24 downsj Exp $
+#	$OpenBSD: Makefile,v 1.12 1997/04/19 21:26:17 millert Exp $
 #
 # All library objects contain sccsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -17,7 +17,7 @@
 
 LIB=c
 CFLAGS+=-DNLS -DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/include
-.if defined(YP)
+.if (${YP} == "yes")
 CFLAGS+=-DYP -I${.CURDIR}/yp
 .endif
 LINTFLAGS=-z
@@ -54,7 +54,7 @@ CLEANFILES+=tags
 .include "${.CURDIR}/termios/Makefile.inc"
 .include "${.CURDIR}/time/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
-.if defined(YP)
+.if (${YP} == "yes")
 .include "${.CURDIR}/yp/Makefile.inc"
 .endif
 
diff --git a/libexec/Makefile b/libexec/Makefile
index f65fe082ad7..eae4ee25731 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.7 (Berkeley) 4/1/91
-#	$OpenBSD: Makefile,v 1.10 1997/02/26 06:17:01 downsj Exp $
+#	$OpenBSD: Makefile,v 1.11 1997/04/19 21:26:18 millert Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@ SUBDIR=	atrun comsat fingerd ftpd getNAME getty identd \
 	rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd \
 	talkd tcpd telnetd tftpd uucpd
 
-.if defined(YP)
+.if (${YP} == "yes")
 SUBDIR+=rpc.yppasswdd
 .endif
 
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index f2f242fcd42..f8b3dec41ab 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 1997/03/26 00:34:34 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 1997/04/19 21:26:20 millert Exp $
 #	$NetBSD: Makefile,v 1.13 1996/02/16 02:07:41 cgd Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 
@@ -15,13 +15,13 @@ CLEANFILES+=ftpcmd.c y.tab.h
 
 .include <bsd.own.mk>
 
-.if defined(SKEY)
+.if (${SKEY} == "yes")
 CFLAGS+=-DSKEY
 LDADD+= -lskey
 DPADD+= ${LIBSKEY}
 .endif
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 SRCS+= klogin.c
 .PATH:	${.CURDIR}/../../usr.bin/login
 CFLAGS+= -DKERBEROS
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index c719007b79e..5c7fb71bd13 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.2 1995/12/16 22:20:19 tholo Exp $
+#	$Id: Makefile,v 1.3 1997/04/19 21:26:20 millert Exp $
 
 PROG=	rlogind
 SRCS=	rlogind.c
@@ -9,7 +9,7 @@ LDADD=	-lutil
 
 .include <bsd.own.mk>	# For KERBEROS
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 SRCS=	rlogind.c des_rw.c
 .PATH:	${.CURDIR}/../../usr.bin/rlogin
 CFLAGS+=-DKERBEROS
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 07db1e49e19..ce0844b24fc 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.2 1995/12/16 22:20:22 tholo Exp $
+#	$Id: Makefile,v 1.3 1997/04/19 21:26:21 millert Exp $
 
 PROG=	rshd
 SRCS=	rshd.c
@@ -7,7 +7,7 @@ MAN=	rshd.8
 
 .include <bsd.own.mk>
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 SRCS+=	des_rw.c
 .PATH:	${.CURDIR}/../../usr.bin/rlogin
 CFLAGS+=-DKERBEROS
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 6c49ac859de..117e3c3f03c 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/04/21 23:46:48 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1997/04/19 21:26:22 millert Exp $
 #	$NetBSD: Makefile,v 1.5 1996/02/18 11:59:09 fvdl Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 
@@ -13,12 +13,14 @@ MAN=	mount_nfs.8
 #.PATH:	${MOUNT}
 CFLAGS+=-DNFS
 
+# NFSKERB is not currently supported
+#
 #.include <bsd.own.mk>	# For KERBEROS
-
-.if defined(KERBEROS)
-CFLAGS+=-DNFSKERB
-DPADD+=	${LIBKRB} ${LIBDES}
-LDADD+=	-lkrb -ldes
-.endif
+#
+#.if (${KERBEROS} == "yes")
+#CFLAGS+=-DNFSKERB
+#DPADD+=	${LIBKRB} ${LIBDES}
+#LDADD+=	-lkrb -ldes
+#.endif
 
 .include <bsd.prog.mk>
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index 0a7e8a4f8cf..5191eb2abc5 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/23 14:31:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/04/19 21:26:23 millert Exp $
 #	$NetBSD: Makefile,v 1.10 1995/03/18 14:58:57 cgd Exp $
 
 PROG=	nfsd
@@ -6,7 +6,7 @@ MAN=	nfsd.8
 
 .include <bsd.own.mk>	# For KERBEROS
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 CFLAGS+=-DKERBEROS
 LDADD+=	-lkrb -ldes
 DPADD+=	${LIBKRB} ${LIBDES}
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 07bde2860a5..f744a7d1cfc 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,22 +1,21 @@
-#	$OpenBSD: bsd.own.mk,v 1.14 1997/02/18 15:52:36 rahnds Exp $
+#	$OpenBSD: bsd.own.mk,v 1.15 1997/04/19 21:26:08 millert Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
+# Host-specific overrides
 .if defined(MAKECONF) && exists(${MAKECONF})
 .include "${MAKECONF}"
 .elif exists(/etc/mk.conf)
 .include "/etc/mk.conf"
 .endif
 
-# Defining `SKEY' causes support for S/key authentication to be compiled in.
-SKEY=		yes
-# Defining `KERBEROS' causes support for Kerberos authentication to be
-# compiled in.
-KERBEROS=	yes
-# Defining 'KERBEROS5' causes support for Kerberos5 authentication to be
-# compiled in.
-#KERBEROS5=	yes
-# Defining 'YP' causes support for NIS/YP to be compiled in
-YP=		yes
+# Set `SKEY' to `yes' to build with support for S/key authentication.
+SKEY?=		yes
+# Set `KERBEROS' to `yes' to build with support for Kerberos authentication.
+KERBEROS?=	yes
+# Set `KERBEROS5' to `yes' to build with support for Kerberos5 authentication.
+KERBEROS5?=	no
+# Set 'YP' to `yes' to build with causes support for NIS/YP.
+YP?=		yes
 
 # where the system object and source trees are kept; can be configurable
 # by the user in case they want them in ~/foosrc and ~/fooobj, for example
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 60701cbfad5..6ed56b5a5e9 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.40 1997/04/08 02:45:10 millert Exp $
+#	$OpenBSD: Makefile,v 1.41 1997/04/19 21:26:24 millert Exp $
 #	$NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $
 #	from: @(#)Makefile	5.8.1.1 (Berkeley) 5/8/91
 
@@ -26,7 +26,7 @@ SUBDIR= apply apropos arch asa at aucat awk banner basename bdes biff cal \
 	xargs xinstall xlint xstr yacc yes \
 	gprof
 
-.if defined(YP)
+.if (${YP} == "yes")
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index fc73925383a..3cb6d33d05a 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1996/10/03 19:31:25 tholo Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/04/19 21:26:25 millert Exp $
 #	$NetBSD: Makefile,v 1.6 1996/05/15 21:50:39 jtc Exp $
 
 .include <bsd.own.mk>
@@ -10,7 +10,7 @@ BINMODE=4555
 .PATH:	${.CURDIR}/../../lib/libc/gen
 LINKS=	${BINDIR}/chpass ${BINDIR}/chfn ${BINDIR}/chpass ${BINDIR}/chsh
 MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
-.if defined(YP)
+.if (${YP} == "yes")
 CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp
 .endif
 DPADD+= ${LIBRPCSVC} ${LIBUTIL}
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index d49d575d4d9..7d22acd9f87 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/03/26 00:35:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/04/19 21:26:26 millert Exp $
 
 PROG=	lock
 BINOWN= root
@@ -6,7 +6,7 @@ BINMODE=4555
 
 .include <bsd.own.mk>
 
-.if defined(SKEY)
+.if (${SKEY} == "yes")
 CFLAGS+=-DSKEY
 LDADD+= -lskey
 DPADD+= ${LIBSKEY}
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 07e00167837..b866fdd7698 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1997/03/26 00:35:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 1997/04/19 21:26:26 millert Exp $
 #	$NetBSD: Makefile,v 1.10 1994/12/23 06:52:56 jtc Exp $
 
 PROG=	login
@@ -8,18 +8,18 @@ DPADD=	${LIBUTIL}
 
 .include <bsd.own.mk>	# For SKEY, KERBEROS and KERBEROS5
 
-.if defined(SKEY)
+.if (${SKEY} == "yes")
 CFLAGS+=-DSKEY
 LDADD+=	-lskey
 DPADD+=	${LIBSKEY}
 .endif
 
-.if defined(KERBEROS5)
+.if (${KERBEROS5} == "yes")
 CFLAGS+= -DKERBEROS5
 SRCS+=	k5login.c
 LDADD+=	-lkrb5 -lcrypto
 DPADD+=	${LIBKRB5} ${LIBCRYPTO}
-.elif defined(KERBEROS)
+.elif (${KERBEROS} == "yes")
 CFLAGS+= -DKERBEROS
 SRCS+=	klogin.c
 LDADD+=	-lkrb -ldes
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 848669c31d1..aaac8e5afb8 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 1997/03/27 00:30:52 weingart Exp $
+#	$OpenBSD: Makefile,v 1.15 1997/04/19 21:26:27 millert Exp $
 
 .include <bsd.own.mk>
 
@@ -9,18 +9,18 @@ DPADD+= ${LIBRPCSVC} ${LIBUTIL}
 LDADD+= -lrpcsvc -lutil
 CFLAGS+= -I${.CURDIR}
 
-.if defined(YP)
+.if (${YP} == "yes")
 CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp
 .endif
 
 .include <bsd.own.mk>	# For Kerberos
 
-.if defined(KERBEROS5)
+.if (${KERBEROS5} == "yes")
 #SRCS+= krb5_passwd.c XXX fix the /tmp/tkt_cpw_%d race first + others
 CFLAGS+= -DKERBEROS5
 DPADD+=	${LIBKRB5} ${LIBCRYPTO}
 LDADD+=	-lkrb5 -lcrypto
-.elif defined(KERBEROS)
+.elif (${KERBEROS} == "yes")
 .PATH:  ${.CURDIR}/../rlogin
 SRCS+= krb_passwd.c des_rw.c
 CFLAGS+= -DKERBEROS
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index e57bf868281..89dfba83647 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/26 05:38:30 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/04/19 21:26:28 millert Exp $
 #	$NetBSD: Makefile,v 1.5 1995/03/21 07:58:28 cgd Exp $
 
 PROG=	rlogin
@@ -9,7 +9,7 @@ BINMODE=4555
 
 .include <bsd.own.mk>
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 CFLAGS+=-DKERBEROS
 SRCS+=	krcmd.c kcmd.c des_rw.c
 LDADD+=	-lkrb -ldes
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index c9958fe03ab..8664d7c31c1 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/26 05:38:48 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/04/19 21:26:29 millert Exp $
 
 PROG=	rsh
 SRCS=	rsh.c
@@ -7,7 +7,7 @@ BINMODE=4555
 
 .include <bsd.own.mk>	# For KERBEROS
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 SRCS+=	des_rw.c
 .PATH:	${.CURDIR}/../rlogin
 CFLAGS+=-DKERBEROS
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 8704c084359..fff7de94641 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/03/26 00:35:37 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/04/19 21:26:30 millert Exp $
 
 PROG=	su
 BINOWN=	root
@@ -6,13 +6,13 @@ BINMODE=4555
 
 .include <bsd.own.mk>
 
-.if defined(SKEY)
+.if (${SKEY} == "yes")
 CFLAGS+=-DSKEY
 LDADD+= -lskey
 DPADD+= ${LIBSKEY}
 .endif
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 CFLAGS+=-DKERBEROS
 LDADD+=	-lkrb -ldes
 DPADD+=	${LIBKRB} ${LIBDES}
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 72122aa95ff..f32babb3716 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 1997/03/03 11:59:10 downsj Exp $
+#	$OpenBSD: Makefile,v 1.26 1997/04/19 21:26:31 millert Exp $
 
 # not yet done: catman
 
@@ -16,7 +16,7 @@ SUBDIR=	ac accton adduser amd arp bootpd bootpgw bootpef bootptest \
 	syslogd tcpdump timed traceroute trpt trsp \
 	vipw vnconfig zdump zic
 
-.if defined (YP)
+.if (${YP} == "yes")
 SUBDIR+=ypbind yppoll ypset ypserv
 .endif
 
diff --git a/usr.sbin/amd/config/Makefile.config b/usr.sbin/amd/config/Makefile.config
index e7b692c60cc..a2a3afb1b5c 100644
--- a/usr.sbin/amd/config/Makefile.config
+++ b/usr.sbin/amd/config/Makefile.config
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.config	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile.config,v 1.2 1996/09/04 22:52:08 deraadt Exp $
+#	$Id: Makefile.config,v 1.3 1997/04/19 21:26:32 millert Exp $
 #
 
 .include <bsd.own.mk>
@@ -44,7 +44,7 @@ OS = bsd44
 # Also define HAS_NIS_RELOAD to include map
 # enumeration code implementing "cache:=all"
 #
-.if defined(YP)
+.if (${YP} == "yes")
 HAS_NIS_MAPS = -DHAS_NIS_MAPS -DHAS_NIS_RELOAD
 .endif
 
diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile
index d984ea4109e..cbeaa8addc1 100644
--- a/usr.sbin/rpc.bootparamd/Makefile
+++ b/usr.sbin/rpc.bootparamd/Makefile
@@ -1,8 +1,8 @@
-#	$Id: Makefile,v 1.2 1996/09/04 22:52:09 deraadt Exp $
+#	$Id: Makefile,v 1.3 1997/04/19 21:26:33 millert Exp $
 
 .include <bsd.own.mk>
 
-.if defined(YP)
+.if (${YP} == "yes")
 CFLAGS+=-DYP
 .endif
 
diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile
index c081d9ab227..64898b33a45 100644
--- a/usr.sbin/rpc.pcnfsd/Makefile
+++ b/usr.sbin/rpc.pcnfsd/Makefile
@@ -7,7 +7,7 @@ MAN=	pcnfsd.8
 MLINKS= pcnfsd.8 rpc.pcnfsd.8
 CFLAGS += -DUSER_CACHE -DWTMP -I${.OBJDIR}
 
-.if defined(YP)
+.if (${YP} == "yes")
 CFLAGS+=-DUSE_YP
 .endif