From 046cc7b93efb079e02456dad8172f924009c8c48 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Wed, 26 Nov 2014 12:54:58 +0000
Subject: [PATCH] Account for /usr/include/protocols/r{outed,whod}.h with their
 respective build knobs

---
 include/protocols/Makefile               | 10 +++++++++-
 tools/build/mk/OptionalObsoleteFiles.inc |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/protocols/Makefile b/include/protocols/Makefile
index 0008c76fb875..c39002ef9598 100644
--- a/include/protocols/Makefile
+++ b/include/protocols/Makefile
@@ -3,9 +3,17 @@
 .include <src.opts.mk>
 
 NO_OBJ=
-INCS=	dumprestore.h routed.h rwhod.h timed.h
+INCS=	dumprestore.h timed.h
 INCSDIR=${INCLUDEDIR}/protocols
 
+.if ${MK_RCMDS} != "no"
+INCS+=	rwhod.h
+.endif
+
+.if ${MK_ROUTED} != "no"
+INCS+=	routed.h
+.endif
+
 .if ${MK_TALK} != "no"
 INCS+=	talkd.h
 .endif
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c1ddf1cd2de3..98dd39c7da72 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3985,6 +3985,7 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.gz
 .endif
 
 .if ${MK_RCMDS} == no
+OLD_FILES+=usr/include/protocols/rwhod.h
 OLD_FILES+=bin/rcp
 OLD_FILES+=etc/pam.d/rsh
 OLD_FILES+=etc/rc.d/rwho
@@ -4040,6 +4041,7 @@ OLD_FILES+=usr/share/man/man8/etcupdate.8.gz
 #.endif
 
 .if ${MK_ROUTED} == no
+OLD_FILES+=usr/include/protocols/routed.h
 OLD_FILES+=sbin/routed
 OLD_FILES+=sbin/rtquery
 OLD_FILES+=usr/share/man/man8/routed.8.gz