diff options
45 files changed, 109 insertions, 109 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2000/08/01 15:56:38 millert Exp $ +# $OpenBSD: Makefile,v 1.58 2000/09/03 18:41:11 espie Exp $ # # For more information on building in tricky environments, please see @@ -38,7 +38,7 @@ SUBDIR+= gnu SUBDIR+= sys lkm -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") SUBDIR+= kerberosIV .endif @@ -83,7 +83,7 @@ build: NOMAN=1 ${SUDO} ${MAKE} install) (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \ NOMAN=1 ${SUDO} ${MAKE} install) -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") (cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \ NOMAN=1 ${SUDO} ${MAKE} install) .endif @@ -333,7 +333,7 @@ cross-lib: cross-dirs ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \ ${MAKE} NOMAN= install) -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") (cd kerberosIV; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ diff --git a/bin/ps/Makefile b/bin/ps/Makefile index 92b75b3ed33..0aefaa3930f 100644 --- a/bin/ps/Makefile +++ b/bin/ps/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2000/05/28 04:22:31 art Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:11 espie Exp $ PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c @@ -8,7 +8,7 @@ BINGRP= kmem BINMODE=2555 .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index bdb115fff25..7af01718b8c 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:35:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:11 espie Exp $ PROG= rcp SRCS= rcp.c util.c @@ -8,7 +8,7 @@ BINMODE=4555 .include <bsd.own.mk> # For KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") .PATH: ${.CURDIR}/../../usr.bin/rlogin SRCS+= krcmd.c kcmd.c CFLAGS+=-DKERBEROS diff --git a/distrib/arc/common/Makefile.inc b/distrib/arc/common/Makefile.inc index 099423b3c08..599dc9a03f6 100644 --- a/distrib/arc/common/Makefile.inc +++ b/distrib/arc/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 1997/09/26 02:20:40 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2000/09/03 18:41:12 espie 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 (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CRUNCHCONF= ${COMMONDIR}/${CBIN}-krb.conf .else CRUNCHCONF= ${COMMONDIR}/${CBIN}.conf @@ -57,7 +57,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c make -f ${CBIN}.mk all -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") mv ${CBIN}-krb ${CBIN} .endif diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc index 9e7c7da67cc..078c2fb1310 100644 --- a/distrib/i386/floppies/common/Makefile.inc +++ b/distrib/i386/floppies/common/Makefile.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.8 1999/08/07 18:05:33 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2000/09/03 18:41:12 espie Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs CBIN?= instbin -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}.conf .else CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}-nokrb.conf diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper index 7edb60c14b4..f42f6d5fca7 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.34 2000/02/21 03:05:42 ho Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.35 2000/09/03 18:41:12 espie Exp $ .include <bsd.own.mk> @@ -11,7 +11,7 @@ CLEANFILES= lib/getdate.c macintosh/Makefile os2/Makefile zlib/Makefile \ doc/cvs.info-8 doc/cvs.info-9 doc/cvsclient.info doc/cvsclient.info-1 \ doc/cvsclient.info-2 doc/cvsclient.info-3 -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") KRB=--with-krb4=/usr --enable-encryption .else KRB=--without-krb4 diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc index 17306bf41b8..a839b1ed210 100644 --- a/gnu/usr.sbin/sendmail/Makefile.inc +++ b/gnu/usr.sbin/sendmail/Makefile.inc @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile.inc,v 1.4 2000/06/18 00:04:20 itojun Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2000/09/03 18:41:12 espie Exp $ .include <bsd.own.mk> .include <bsd.obj.mk> ENVDEF+= -DNEWDB -DMAP_REGEX ENVDEF+= -DNETINET6 -DNEEDSGETIPNODE -.if (${YP} == "yes") +.if (${YP:L} == "yes") ENVDEF+=-DNIS .endif .if defined(WANT_LIBWRAP) -.if (${TCP_WRAPPERS} == "yes") +.if (${TCP_WRAPPERS:L} == "yes") ENVDEF+=-DTCPWRAPPERS DPADD+= ${LIBWRAP} LDADD+= -lwrap diff --git a/include/Makefile b/include/Makefile index d8d90c67a2d..0766609ee84 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.82 2000/08/20 18:37:19 millert Exp $ +# $OpenBSD: Makefile,v 1.83 2000/09/03 18:41:13 espie Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -59,7 +59,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 (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") RDIRS+= ../kerberosIV/lib PRDIRS+=../kerberosIV/lib/kadm ../kerberosIV/lib/krb .endif diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc index 770171dac76..72ecb7fa6d1 100644 --- a/lib/libc/Makefile.inc +++ b/lib/libc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2000/01/06 08:47:07 d Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2000/09/03 18:41:13 espie Exp $ # # This file contains make rules that are shared by libc and libc_r. # @@ -10,7 +10,7 @@ all: CFLAGS+= -DLIBC_SCCS -DSYSLIBC_SCCS -I${LIBCSRCDIR}/include -.if (${YP} == "yes") +.if (${YP:L} == "yes") CFLAGS+=-DYP -I${LIBCSRCDIR}/yp .endif @@ -47,7 +47,7 @@ AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include .include "${LIBCSRCDIR}/thread/Makefile.inc" .include "${LIBCSRCDIR}/time/Makefile.inc" .include "${LIBCSRCDIR}/sys/Makefile.inc" -.if (${YP} == "yes") +.if (${YP:L} == "yes") .include "${LIBCSRCDIR}/yp/Makefile.inc" .endif diff --git a/lib/libkvm.old/Makefile b/lib/libkvm.old/Makefile index 8c5d6c51e02..aa7926a0b42 100644 --- a/lib/libkvm.old/Makefile +++ b/lib/libkvm.old/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1999/12/01 09:58:16 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2000/09/03 18:41:13 espie Exp $ # $NetBSD: Makefile,v 1.4 1996/05/13 02:30:20 thorpej Exp $ LIB= kvm @@ -25,6 +25,6 @@ MLINKS+=kvm_read.3 kvm_write.3 .include <bsd.lib.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index 3b3509c2032..42d51f67677 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1999/06/22 14:40:50 art Exp $ +# $OpenBSD: Makefile,v 1.5 2000/09/03 18:41:13 espie Exp $ # $NetBSD: Makefile,v 1.11 1996/03/18 22:33:07 thorpej Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/4/93 @@ -27,6 +27,6 @@ MLINKS+=kvm_dump.3 kvm_dump_inval.3 .include <bsd.lib.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index cea65a18f80..125cb56e11b 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $OpenBSD: Makefile,v 1.3 1998/03/12 04:48:42 art Exp $ +# $OpenBSD: Makefile,v 1.4 2000/09/03 18:41:14 espie Exp $ # $NetBSD: Makefile,v 1.6 1996/02/24 01:15:15 jtk Exp $ LIB= telnet @@ -9,13 +9,13 @@ CFLAGS+= -DHAS_CGETENT .include <bsd.own.mk> # for KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+= -DKRB4 -DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION SRCS+= kerberos.c enc_des.c .endif # XXX this has not been tested due to lack of kerberos5 to test with. -.if (${KERBEROS5} == "yes") +.if (${KERBEROS5:L} == "yes") CFLAGS+= -DKRB5 -DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION SRCS+= kerberos5.c enc_des.c .endif diff --git a/libexec/Makefile b/libexec/Makefile index 17ddcb4e4ab..e4b905c7442 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $OpenBSD: Makefile,v 1.15 1998/08/15 21:02:20 millert Exp $ +# $OpenBSD: Makefile,v 1.16 2000/09/03 18:41:14 espie Exp $ .include <bsd.own.mk> @@ -8,7 +8,7 @@ SUBDIR= atrun comsat fingerd ftpd getNAME getty identd lockspool \ rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd \ talkd tcpd telnetd tftpd uucpd smtpd -.if (${YP} == "yes") +.if (${YP:L} == "yes") SUBDIR+=rpc.yppasswdd .endif diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 138909dd3d1..6c39d019047 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2000/07/19 19:28:02 mickey Exp $ +# $OpenBSD: Makefile,v 1.18 2000/09/03 18:41:14 espie Exp $ # $NetBSD: Makefile,v 1.13 1996/02/16 02:07:41 cgd Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 @@ -20,13 +20,13 @@ CFLAGS += -I${LSDIR} # not really used CPPFLAGS+=-DINET6 -.if (${SKEY} == "yes") +.if (${SKEY:L} == "yes") CFLAGS+=-DSKEY LDADD+= -lskey DPADD+= ${LIBSKEY} .endif -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") SRCS+= klogin.c .PATH: ${.CURDIR}/../../usr.bin/login CFLAGS+= -DKERBEROS @@ -34,7 +34,7 @@ LDADD+= -lkafs -lkrb -ldes DPADD+= ${LIBKRB} ${LIBKRB} ${LIBKAFS} .endif -.if (${TCP_WRAPPERS} == "yes") +.if (${TCP_WRAPPERS:L} == "yes") CFLAGS+=-DTCPWRAPPERS LDADD+= -lwrap DPADD+= ${LIBWRAP} diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile index 5c7fb71bd13..1bd5fc8fe67 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.3 1997/04/19 21:26:20 millert Exp $ +# $Id: Makefile,v 1.4 2000/09/03 18:41:14 espie Exp $ PROG= rlogind SRCS= rlogind.c @@ -9,7 +9,7 @@ LDADD= -lutil .include <bsd.own.mk> # For KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") SRCS= rlogind.c des_rw.c .PATH: ${.CURDIR}/../../usr.bin/rlogin CFLAGS+=-DKERBEROS diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile index e724e739b66..dbb5e1389c9 100644 --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1999/11/30 07:39:26 art Exp $ +# $Id: Makefile,v 1.4 2000/09/03 18:41:15 espie Exp $ PROG = rpc.rstatd .PATH: ${.CURDIR}/../../usr.bin/vmstat @@ -13,7 +13,7 @@ LDADD= -lrpcsvc -lkvm .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile index a23e8e751f5..34ceca9eb50 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.4 1998/05/15 04:28:25 art Exp $ +# $Id: Makefile,v 1.5 2000/09/03 18:41:15 espie Exp $ PROG= rshd SRCS= rshd.c @@ -8,7 +8,7 @@ CFLAGS+= -Wall -Wno-unused .include <bsd.own.mk> -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") SRCS+= des_rw.c .PATH: ${.CURDIR}/../../usr.bin/rlogin CFLAGS+=-DKERBEROS diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 7afdc6dee3d..5eced15f9bb 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 1998/07/27 18:28:18 millert Exp $ +# $OpenBSD: Makefile,v 1.8 2000/09/03 18:41:16 espie Exp $ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $NetBSD: Makefile,v 1.6 1996/02/24 01:22:12 jtk Exp $ @@ -15,7 +15,7 @@ MAN= telnetd.8 .include <bsd.own.mk> # for KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4 -I${.CURDIR}/../../lib LDADD+= -lkrb -ldes DPADD+= ${LIBDES} ${LIBKRB} diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile index 52160cbe256..826a648ed08 100644 --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1997/09/21 11:37:24 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2000/09/03 18:41:16 espie Exp $ PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c @@ -15,7 +15,7 @@ CFLAGS+=-DNFS # #.include <bsd.own.mk> # For KERBEROS # -#.if (${KERBEROS} == "yes") +#.if (${KERBEROS:L} == "yes") #CFLAGS+=-DNFSKERB #DPADD+= ${LIBKRB} ${LIBDES} #LDADD+= -lkrb -ldes diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile index abf39ee9998..02f8e6870d9 100644 --- a/sbin/nfsd/Makefile +++ b/sbin/nfsd/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:37:46 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:16 espie Exp $ PROG= nfsd MAN= nfsd.8 .include <bsd.own.mk> # For KERBEROS -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") CFLAGS+=-DKERBEROS LDADD+= -lkrb -ldes DPADD+= ${LIBKRB} ${LIBDES} diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile index dc7b875acad..45e780bcbbb 100644 --- a/sbin/sysctl/Makefile +++ b/sbin/sysctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2000/01/01 22:38:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2000/09/03 18:41:16 espie Exp $ PROG= sysctl MAN= sysctl.8 @@ -10,6 +10,6 @@ afterinstall: .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/share/lkm/vfs/module/Makefile b/share/lkm/vfs/module/Makefile index 6f6da8fb6ec..a301f96d11a 100644 --- a/share/lkm/vfs/module/Makefile +++ b/share/lkm/vfs/module/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2000/03/02 14:46:40 todd Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/03 18:41:17 espie Exp $ # # Makefile for newsyscall # @@ -69,7 +69,7 @@ $(MODOBJ): $(OBJS) $(KOBJS) .include <bsd.own.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 341f2d2ce27..70733ec0660 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.23 2000/07/15 12:45:04 rahnds Exp $ +# $OpenBSD: bsd.lib.mk,v 1.24 2000/09/03 18:41:23 espie Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -118,7 +118,7 @@ PICFLAG+=-fno-function-cse .endif _LIBS=lib${LIB}.a -.if (${DEBUGLIBS} == "yes") +.if (${DEBUGLIBS:L} == "yes") _LIBS+=lib${LIB}_g.a .endif .if !defined(NOPROFILE) @@ -235,7 +235,7 @@ realinstall: ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a .endif chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a -.if (${DEBUGLIBS} == "yes") +.if (${DEBUGLIBS:L} == "yes") # ranlib lib${LIB}_g.a ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ lib${LIB}_g.a ${DESTDIR}${LIBDIR}/debug/lib${LIB}.a 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 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 6ee30db9636..876eea218b5 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.68 2000/09/01 05:59:12 aaron Exp $ +# $OpenBSD: Makefile,v 1.69 2000/09/03 18:41:22 espie Exp $ # not yet done: catman @@ -25,11 +25,11 @@ SUBDIR+=bad144 apm apmd fdformat memconfig SUBDIR+=eeprom screenblank grfinfo hilinfo SUBDIR+=wsconscfg wsfontload -.if (${AFS} == "yes") +.if (${AFS:L} == "yes") SUBDIR+=afs .endif -.if (${YP} == "yes") +.if (${YP:L} == "yes") SUBDIR+=ypbind yppoll ypset ypserv .endif diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index 89def539dfb..acb3e77820b 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1999/06/23 11:47:29 art Exp $ +# $OpenBSD: Makefile,v 1.5 2000/09/03 18:41:22 espie Exp $ PROG= pstat MAN= pstat.8 @@ -9,7 +9,7 @@ LDADD= -lkvm .include <bsd.prog.mk> -.if (${UVM} == "yes") +.if (${UVM:L} == "yes") CFLAGS+=-DUVM .endif diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile index 194598826aa..4302c922858 100644 --- a/usr.sbin/rpc.bootparamd/Makefile +++ b/usr.sbin/rpc.bootparamd/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 1997/09/21 11:44:16 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2000/09/03 18:41:22 espie Exp $ .include <bsd.own.mk> -.if (${YP} == "yes") +.if (${YP:L} == "yes") CFLAGS+=-DYP .endif diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile index 30bbbc9bccc..07bc6b23ca6 100644 --- a/usr.sbin/rpc.pcnfsd/Makefile +++ b/usr.sbin/rpc.pcnfsd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1997/09/21 11:44:17 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2000/09/03 18:41:22 espie Exp $ .include <bsd.own.mk> @@ -7,7 +7,7 @@ MAN= pcnfsd.8 MLINKS= pcnfsd.8 rpc.pcnfsd.8 CFLAGS += -DUSER_CACHE -DWTMP -I${.OBJDIR} -.if (${YP} == "yes") +.if (${YP:L} == "yes") CFLAGS+=-DUSE_YP .endif |