From e23b0a2ed692c2040c8d5a9390de015c21db4d30 Mon Sep 17 00:00:00 2001
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 12 Jan 2009 17:19:17 +0000
Subject: sync build infrastructure changes with HEAD

Reviewed by:	imp
---
 libexec/Makefile | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'libexec')

diff --git a/libexec/Makefile b/libexec/Makefile
index 6a32d10c20ff..0731b043fe2a 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -3,9 +3,9 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	atrun \
+SUBDIR=	${_atrun} \
 	bootpd \
-	comsat \
+	${_comsat} \
 	fingerd \
 	ftpd \
 	getty \
@@ -13,7 +13,7 @@ SUBDIR=	atrun \
 	${_mail.local} \
 	makekey \
 	${_mknetid} \
-	pppoed \
+	${_pppoed} \
 	pt_chown \
 	rbootd \
 	revnetgroup \
@@ -29,16 +29,28 @@ SUBDIR=	atrun \
 	${_smrsh} \
 	talkd \
 	tcpd \
-	telnetd \
+	${_telnetd} \
 	tftpd \
 	${_tftp-proxy} \
 	${_ypxfr}
 
+.if ${MK_AT} != "no"
+_atrun=		atrun
+.endif
+
+.if ${MK_MAIL} != "no"
+_comsat=	comsat
+.endif
+
 .if ${MK_NIS} != "no"
 _mknetid=	mknetid
 _ypxfr=		ypxfr
 .endif
 
+.if ${MK_NETGRAPH} != "no"
+_pppoed=	pppoed
+.endif
+
 .if ${MK_PF} != "no"
 _tftp-proxy=	tftp-proxy
 .endif
@@ -54,7 +66,11 @@ _rshd=		rshd
 
 .if ${MK_SENDMAIL} != "no"
 _mail.local=	mail.local
-_smrsh=	smrsh
+_smrsh=		smrsh
+.endif
+
+.if ${MK_TELNET} != "no"
+_telnetd=	telnetd
 .endif
 
 .include <bsd.subdir.mk>
-- 
cgit v1.3