permit YP to be compiled out using flag in bsd.own.mk; pr#15, peter@demon.net

5 files changed, 32 insertions, 7 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 46a0ccfb932..6e448bb183d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,7 +1,9 @@
-#	$OpenBSD: Makefile,v 1.17 1996/08/26 07:50:12 downsj Exp $
+#	$OpenBSD: Makefile,v 1.18 1996/09/04 22:52:07 deraadt Exp $
 
 # not yet done: catman
 
+.include <bsd.own.mk>
+
 SUBDIR=	ac accton arp bootpd bootpgw bootpef bootptest \
 	chown chroot config cron dev_mkdb \
 	diskpart edquota gspa inetd iostat \
@@ -12,8 +14,11 @@ SUBDIR=	ac accton arp bootpd bootpgw bootpef bootptest \
 	rpc.bootparamd rpc.pcnfsd rwhod \
 	sa sendmail sliplogin slstats spray sysctl \
 	syslogd tcpdump timed traceroute trpt trsp \
-	vipw vnconfig ypbind yppoll ypset \
-	ypserv zdump zic
+	vipw vnconfig zdump zic
+
+.if defined (YP)
+SUBDIR+=ypbind yppoll ypset ypserv
+.endif
 
 # should be listed above, but doesn't work on the Alpha.
 .if   (${MACHINE_ARCH} != "alpha") || make(clean) || make(cleandir)
diff --git a/usr.sbin/amd/config/Makefile.config b/usr.sbin/amd/config/Makefile.config
index a3a746b7f16..e7b692c60cc 100644
--- a/usr.sbin/amd/config/Makefile.config
+++ b/usr.sbin/amd/config/Makefile.config
@@ -1,7 +1,9 @@
 #	from: @(#)Makefile.config	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile.config,v 1.1 1995/10/18 08:47:13 deraadt Exp $
+#	$Id: Makefile.config,v 1.2 1996/09/04 22:52:08 deraadt Exp $
 #
 
+.include <bsd.own.mk>
+
 OS = bsd44
 
 #
@@ -42,7 +44,9 @@ OS = bsd44
 # Also define HAS_NIS_RELOAD to include map
 # enumeration code implementing "cache:=all"
 #
+.if defined(YP)
 HAS_NIS_MAPS = -DHAS_NIS_MAPS -DHAS_NIS_RELOAD
+.endif
 
 #
 # Include support for file maps
diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile
index 9a275277b92..d984ea4109e 100644
--- a/usr.sbin/rpc.bootparamd/Makefile
+++ b/usr.sbin/rpc.bootparamd/Makefile
@@ -1,6 +1,10 @@
-#	$Id: Makefile,v 1.1 1995/10/18 08:48:05 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/09/04 22:52:09 deraadt Exp $
 
+.include <bsd.own.mk>
+
+.if defined(YP)
 CFLAGS+=-DYP
+.endif
 
 PROG=	rpc.bootparamd
 SRCS=	bootparamd.c bootparam_prot_svc.c
diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile
index 368adf8e79a..c658251d5d1 100644
--- a/usr.sbin/rpc.pcnfsd/Makefile
+++ b/usr.sbin/rpc.pcnfsd/Makefile
@@ -1,9 +1,15 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/25 22:20:13 gwr Exp $
 
+.include <bsd.own.mk>
+
 PROG=	rpc.pcnfsd
 MAN=	pcnfsd.8
 MLINKS= pcnfsd.8 rpc.pcnfsd.8
-CFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR}
+CFLAGS += -DUSER_CACHE -DWTMP -I${.OBJDIR}
+
+.if defined(YP)
+CFLAGS+=-DUSE_YP
+.endif
 
 SRCS=	pcnfsd_v1.c pcnfsd_v2.c pcnfsd_misc.c \
 	pcnfsd_cache.c pcnfsd_print.c pcnfsd_svc.c pcnfsd_xdr.c
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 0fa39dba444..fb171f7bd52 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -6,6 +6,8 @@
 #	@Id: Makefile.NetBSD,v 1.3 1994/02/01 05:33:44 glass Exp $
 #
 
+.include <bsd.own.mk>
+
 PROG=	sendmail
 
 # define the database format to use for aliases et al.  Can be -DNEWDB (for
@@ -16,7 +18,11 @@ PROG=	sendmail
 # databases are read, but the new format will be used on any rebuilds.  On
 # really gnarly systems, you can set this to null; it will crawl like a high
 # spiral snail, but it will work.
-DBMDEF=	-DNEWDB -DNIS
+DBMDEF=	-DNEWDB
+
+.if defined(YP)
+DBMDEF+=-DNIS
+.endif
 
 CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO