diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/chpass/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/lock/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/login/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/rlogin/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/rsh/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/su/Makefile | 6 |
8 files changed, 21 insertions, 21 deletions
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} |