Author: bdrewery
Date: Tue Oct 27 01:29:38 2015
New Revision: 290034
URL: https://svnweb.freebsd.org/changeset/base/290034
Log:
META MODE: Fix after addition of bsd.confs.mk: Stage in "files" set.
The "files" staging name is not the same as "bsd.files.mk" but seems to just
be
a group of extra files that are not the essential includes or libraries, which
include .
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk Tue Oct 27 01:28:11 2015 (r290033)
+++ head/share/mk/bsd.confs.mk Tue Oct 27 01:29:38 2015 (r290034)
@@ -44,7 +44,6 @@ STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:
# XXX {group}OWN,GRP,MODE
STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}}
stage_as.${cnf:T}: ${cnf}
-stage_config: stage_as.${cnf:T}
installconfig: _${group}INS_${cnf:T}
_${group}INS_${cnf:T}: ${cnf}
@@ -58,7 +57,6 @@ _${group}CONFS+= ${cnf}
.endfor
.if !empty(_${group}CONFS)
stage_files.${group}: ${_${group}CONFS}
-stage_config: stage_files.${group}
installconfig: _${group}INS
_${group}INS: ${_${group}CONFS}
@@ -76,8 +74,12 @@ _${group}INS: ${_${group}CONFS}
.endif # !target(installconfig)
-.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
-.if !defined(NO_STAGE_CONFIG)
-STAGE_TARGETS+= stage_config
+.if ${MK_STAGING} != "no"
+.if !empty(STAGE_SETS)
+buildconfig: stage_files
+.if !empty(STAGE_AS_SETS)
+buildconfig: stage_as
.endif
.endif
+.endif
+
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
