diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2000-09-03 18:41:24 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2000-09-03 18:41:24 +0000 |
commit | 228758662f475a61b9ae4f95b4fa2b910d112a0f (patch) | |
tree | 89af97fc39223c1fd3e255e50736787e50dcf6c8 /usr.bin | |
parent | 570e744e53b725c62fcaf7d2f8551b4b887c1fd3 (diff) |
Boring... Add :L modifier to all tweakable variables tests.
Closes PR 1246
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/fstat/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/ftp/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/ssh/lib/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/ssh/ssh/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/ssh/sshd/Makefile | 10 | ||||
-rw-r--r-- | usr.bin/su/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/sudo/Makefile.bsd-wrapper | 6 | ||||
-rw-r--r-- | usr.bin/systat/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/telnet/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/top/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/vmstat/Makefile | 4 |
18 files changed, 45 insertions, 45 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 12c5bbb4685..244269c6ae2 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.66 2000/07/19 23:43:27 mickey Exp $ +# $OpenBSD: Makefile,v 1.67 2000/09/03 18:41:17 espie Exp $ .include <bsd.own.mk> @@ -20,7 +20,7 @@ SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \ uuencode vacation vgrind vi vis vmstat w wall wc what whatis which \ who whois window write xargs xinstall xlint xstr yacc yes -.if (${YP} == "yes") +.if (${YP:L} == "yes") SUBDIR+=ypcat ypmatch ypwhich .endif diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index d795b3c543b..0492a99b399 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 1997/09/21 11:48:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2000/09/03 18:41:17 espie Exp $ .include <bsd.own.mk> @@ -9,7 +9,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 (${YP} == "yes") +.if (${YP:L} == "yes") CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp .endif DPADD+= ${LIBRPCSVC} ${LIBUTIL} diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile index 229f1f0b955..f95b67ac892 100644 --- a/usr.bin/fstat/Makefile +++ b/usr.bin/fstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2000/01/17 16:26:18 itojun Exp $ +# $OpenBSD: Makefile,v 1.7 2000/09/03 18:41:17 espie Exp $ PROG= fstat DPADD= ${LIBKVM} @@ -11,6 +11,6 @@ CFLAGS+=-DINET6 .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 5ac6c4f2dfa..72546e7ca76 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 1999/12/08 12:57:06 itojun Exp $ +# $OpenBSD: Makefile,v 1.17 2000/09/03 18:41:23 espie Exp $ # Define SMALL to disable command line editing #CFLAGS+=-DSMALL @@ -6,7 +6,7 @@ # Uncomment the following to provide defaults for gate-ftp operation #CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21 -.if (defined(USE_SOCKS) && ${USE_SOCKS} == "YES") +.if (defined(USE_SOCKS) && ${USE_SOCKS:L} == "yes") CFLAGS += -DSOCKS -I/usr/local/include LDADD += -lsocks5 .endif diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile index 083c0297fbe..4a9c68dce62 100644 --- a/usr.bin/lock/Makefile +++ b/usr.bin/lock/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 1999/03/06 20:27:39 millert Exp $ +# $OpenBSD: Makefile,v 1.9 2000/09/03 18:41:17 espie Exp $ PROG= lock BINOWN= root @@ -6,7 +6,7 @@ BINMODE=4555 .include <bsd.own.mk> -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") CFLAGS+=-DSKEY LDADD+= -lskey DPADD+= ${LIBSKEY} diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index fa54d2fd466..b08043af7fd 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2000/03/01 18:33:56 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2000/09/03 18:41:18 espie Exp $ PROG= login SRCS= login.c failedlogin.c @@ -8,18 +8,18 @@ CFLAGS+= -Wall -Wno-unused .include <bsd.own.mk> # For SKEY, KERBEROS and KERBEROS5 -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") CFLAGS+=-DSKEY LDADD+= -lskey DPADD+= ${LIBSKEY} .endif -.if (${KERBEROS5} == "yes") +.if (${KERBEROS5:L} == "yes") CFLAGS+= -DKERBEROS5 SRCS+= k5login.c LDADD+= -lkrb5 -lcrypto DPADD+= ${LIBKRB5} ${LIBCRYPTO} -.elif (${KERBEROS} == "yes") +.elif (${KERBEROS:L} == "yes") CFLAGS+= -DKERBEROS SRCS+= klogin.c LDADD+= -lkafs -lkrb -ldes diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 43bbc693f7d..16b4a985e95 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2000/08/01 22:27:50 provos Exp $ +# $OpenBSD: Makefile,v 1.20 2000/09/03 18:41:18 espie Exp $ .include <bsd.own.mk> @@ -10,18 +10,18 @@ DPADD+= ${LIBRPCSVC} ${LIBUTIL} LDADD+= -lrpcsvc -lutil CFLAGS+= -I${.CURDIR} -.if (${YP} == "yes") +.if (${YP:L} == "yes") CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp .endif .include <bsd.own.mk> # For Kerberos -.if (${KERBEROS5} == "yes") +.if (${KERBEROS5:L} == "yes") #SRCS+= krb5_passwd.c XXX fix the /tmp/tkt_cpw_%d race first + others CFLAGS+= -DKERBEROS5 DPADD+= ${LIBKRB5} ${LIBCRYPTO} LDADD+= -lkrb5 -lcrypto -.elif (${KERBEROS} == "yes") +.elif (${KERBEROS:L} == "yes") .PATH: ${.CURDIR}/../rlogin SRCS+= new_pwd.c krb_passwd.c des_rw.c CFLAGS+= -DKERBEROS diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile index 16d4fbbb20a..52ec1e88340 100644 --- a/usr.bin/rlogin/Makefile +++ b/usr.bin/rlogin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:36 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:18 espie Exp $ PROG= rlogin SRCS= rlogin.c @@ -8,7 +8,7 @@ BINMODE=4555 .include <bsd.own.mk> -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "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 8664d7c31c1..6a717e2ae2b 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1997/04/19 21:26:29 millert Exp $ +# $OpenBSD: Makefile,v 1.5 2000/09/03 18:41:18 espie Exp $ PROG= rsh SRCS= rsh.c @@ -7,7 +7,7 @@ BINMODE=4555 .include <bsd.own.mk> # For KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") SRCS+= des_rw.c .PATH: ${.CURDIR}/../rlogin CFLAGS+=-DKERBEROS diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile index 48a93d00a28..4bbe22216e2 100644 --- a/usr.bin/ssh/lib/Makefile +++ b/usr.bin/ssh/lib/Makefile @@ -15,9 +15,9 @@ install: .include <bsd.own.mk> -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV -.if (${AFS} == "yes") +.if (${AFS:L} == "yes") CFLAGS+= -DAFS SRCS+= radix.c .endif # AFS diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 9c8f152284b..bd415312cdd 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -15,11 +15,11 @@ SRCS= ssh.c log-client.c readconf.c clientloop.c \ .include <bsd.own.mk> # for AFS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV LDADD+= -lkrb DPADD+= ${LIBKRB} -.if (${AFS} == "yes") +.if (${AFS:L} == "yes") CFLAGS+= -DAFS LDADD+= -lkafs DPADD+= ${LIBKRBAFS} diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 70e496b23eb..0adfcd6391f 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -13,8 +13,8 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ .include <bsd.own.mk> # for KERBEROS and AFS -.if (${KERBEROS} == "yes") -.if (${AFS} == "yes") +.if (${KERBEROS:L} == "yes") +.if (${AFS:L} == "yes") CFLAGS+= -DAFS LDADD+= -lkafs DPADD+= ${LIBKRBAFS} @@ -25,7 +25,7 @@ LDADD+= -lkrb DPADD+= ${LIBKRB} .endif # KERBEROS -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") SRCS+= auth-skey.c .endif @@ -34,13 +34,13 @@ SRCS+= auth-skey.c LDADD+= -lcrypto -lutil -lz DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} -.if (${TCP_WRAPPERS} == "yes") +.if (${TCP_WRAPPERS:L} == "yes") CFLAGS+= -DLIBWRAP LDADD+= -lwrap DPADD+= ${LIBWRAP} .endif -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") CFLAGS+= -DSKEY LDADD+= -lskey DPADD+= ${SKEY} diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index fff7de94641..42cec9870c9 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1997/04/19 21:26:30 millert Exp $ +# $OpenBSD: Makefile,v 1.7 2000/09/03 18:41:19 espie Exp $ PROG= su BINOWN= root @@ -6,13 +6,13 @@ BINMODE=4555 .include <bsd.own.mk> -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") CFLAGS+=-DSKEY LDADD+= -lskey DPADD+= ${LIBSKEY} .endif -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+=-DKERBEROS LDADD+= -lkrb -ldes DPADD+= ${LIBKRB} ${LIBDES} diff --git a/usr.bin/sudo/Makefile.bsd-wrapper b/usr.bin/sudo/Makefile.bsd-wrapper index 6b727f5379b..d5f5ab0950d 100644 --- a/usr.bin/sudo/Makefile.bsd-wrapper +++ b/usr.bin/sudo/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2000/08/20 18:42:41 millert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2000/09/03 18:41:19 espie Exp $ MAN= sudo.8 sudoers.5 visudo.8 XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDFLAGS}" @@ -7,13 +7,13 @@ CONFIGURE_OPTS= --prefix=/usr --with-devel --with-insults --with-logincap \ .include <bsd.own.mk> -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") CONFIGURE_OPTS+=--with-skey LDADD+= -lskey DPADD+= ${LIBSKEY} .endif -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CONFIGURE_OPTS+=--with-kerb4 LDADD+= -lkrb -ldes -lkafs DPADD+= ${LIBKRB} ${LIBDES} ${LIBKAFS} diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index d3419f344b7..7e02b3109d0 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2000/01/05 11:04:21 itojun Exp $ +# $OpenBSD: Makefile,v 1.12 2000/09/03 18:41:20 espie Exp $ PROG= systat @@ -16,6 +16,6 @@ CPPFLAGS+=-DINET6 .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 915b064950e..984ffdb3b37 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 1998/07/27 15:25:13 millert Exp $ +# $OpenBSD: Makefile,v 1.9 2000/09/03 18:41:20 espie Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -47,7 +47,7 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ .include <bsd.own.mk> # for KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4 LDADD+= -lkrb -ldes DPADD+= ${LIBDES} ${LIBKRB} diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index 03bdf1fa9ed..775d073a792 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2000/06/05 16:39:51 art Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:20 espie Exp $ # # Makefile for OpenBSD top-3.4. @@ -21,6 +21,6 @@ sigdesc.h: sigconv.awk .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile index dae7214c04a..77e36ae4862 100644 --- a/usr.bin/vmstat/Makefile +++ b/usr.bin/vmstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1999/06/23 18:48:12 art Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:20 espie Exp $ PROG= vmstat @@ -11,6 +11,6 @@ BINMODE=2555 .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif |