diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-04-19 21:26:35 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-04-19 21:26:35 +0000 |
| commit | 60f0cc8b06f6b2a732dba45282047230a78eab47 (patch) | |
| tree | 095b6ccdab3a498288710207dff5b8c76acad921 /sbin | |
| parent | 11de9e6ceccf61da35fe169021912e46267d7f74 (diff) | |
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.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/mount_nfs/Makefile | 16 | ||||
| -rw-r--r-- | sbin/nfsd/Makefile | 4 |
2 files changed, 11 insertions, 9 deletions
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} |