From 19edb751d70663ee5be0b0a96abe9ceaf878ab8f Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Fri, 3 Feb 2006 16:50:32 +0000
Subject: [PATCH] Handle NO_INCS solely inside bsd.incs.mk.

---
 share/mk/bsd.incs.mk | 10 ++++------
 share/mk/bsd.lib.mk  |  2 --
 share/mk/bsd.prog.mk |  2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index 5d7d9b5928d1..924458b71460 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -4,6 +4,8 @@
 .error bsd.incs.mk cannot be included directly.
 .endif
 
+.if !defined(NO_INCS) && !defined(NO_TOOLCHAIN)
+
 INCSGROUPS?=	INCS
 
 .if !target(buildincludes)
@@ -39,12 +41,10 @@ ${group}NAME_${header:T}?=	${header:T}
 .endif
 installincludes: _${group}INS_${header:T}
 _${group}INS_${header:T}: ${header}
-.if !defined(NO_TOOLCHAIN)
 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
 	    ${.ALLSRC} \
 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-.endif
 .else
 _${group}INCS+= ${header}
 .endif
@@ -52,7 +52,6 @@ _${group}INCS+= ${header}
 .if !empty(_${group}INCS)
 installincludes: _${group}INS
 _${group}INS: ${_${group}INCS}
-.if !defined(NO_TOOLCHAIN)
 .if defined(${group}NAME)
 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
@@ -60,7 +59,6 @@ _${group}INS: ${_${group}INCS}
 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
 .endif
-.endif # !defined(NO_TOOLCHAIN)
 .endif
 
 .endif # defined(${group}) && !empty(${group})
@@ -68,7 +66,6 @@ _${group}INS: ${_${group}INCS}
 
 .if defined(INCSLINKS) && !empty(INCSLINKS)
 installincludes:
-.if !defined(NO_TOOLCHAIN)
 	@set ${INCSLINKS}; \
 	while test $$# -ge 2; do \
 		l=$$1; \
@@ -78,9 +75,10 @@ installincludes:
 		${ECHO} $$t -\> $$l; \
 		ln -fs $$l $$t; \
 	done; true
-.endif # !defined(NO_TOOLCHAIN)
 .endif
 .endif # !target(installincludes)
 
 realinstall: installincludes
 .ORDER: beforeinstall installincludes
+
+.endif # !defined(NO_INCS) && !defined(NO_TOOLCHAIN)
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 71e474ac769a..c60c133fe5b6 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -244,9 +244,7 @@ _libinstall:
 
 .include <bsd.nls.mk>
 .include <bsd.files.mk>
-.if !defined(NO_INCS)
 .include <bsd.incs.mk>
-.endif
 .include <bsd.links.mk>
 
 .if !defined(NO_MAN)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index ebe2a012a735..3b4d0922674d 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -174,9 +174,7 @@ NLSNAME?=	${PROG}
 .include <bsd.nls.mk>
 
 .include <bsd.files.mk>
-.if !defined(NO_INCS)
 .include <bsd.incs.mk>
-.endif
 .include <bsd.links.mk>
 
 .if !defined(NO_MAN)