From: bdrewery <bdrewery@FreeBSD.org>
Date: Sat, 24 Oct 2015 04:03:29 +0000 (+0000)
Subject: Configs should not be under MK_INCLUDES control.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=706949f11e5340cfa991452419cfb1db799e9b04;p=people%2Fliuw%2Ffreebsd.git

Configs should not be under MK_INCLUDES control.

'buildconfig' is connected to 'all', but 'installconfig' is only called
manually.  There is not much need to conditionalize this file right
now due to how it is hooked up and its impact on various build phases.

Sponsored by:	EMC / Isilon Storage Division
---

diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk
index 36298d7da02..533ba71e5f5 100644
--- a/share/mk/bsd.confs.mk
+++ b/share/mk/bsd.confs.mk
@@ -4,7 +4,6 @@
 .error bsd.conf.mk cannot be included directly.
 .endif
 
-.if ${MK_INCLUDES} != "no"
 CONFGROUPS?=	CONFS
 
 .if !target(buildconfig)
@@ -83,5 +82,3 @@ _${group}INS: ${_${group}CONFS}
 STAGE_TARGETS+= stage_config
 .endif
 .endif
-
-.endif # ${MK_INCLUDES} != "no"