d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

META MODE: Fix after addition of bsd.confs.mk: Stage in "files" set.

Browse Source 
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
This commit is contained in:
bdrewery 2015-10-27 01:29:38 +00:00
parent 248fec0cc6
commit a4a0534f00
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
share/mk/bsd.confs.mk
View File

@ -44,7 +44,6 @@ STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
# XXX {group}OWN,GRP,MODE # XXX {group}OWN,GRP,MODE
STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}} STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}}
stage_as.${cnf:T}: ${cnf} stage_as.${cnf:T}: ${cnf}
stage_config: stage_as.${cnf:T}
installconfig: _${group}INS_${cnf:T} installconfig: _${group}INS_${cnf:T}
_${group}INS_${cnf:T}: ${cnf} _${group}INS_${cnf:T}: ${cnf}
@ -58,7 +57,6 @@ _${group}CONFS+= ${cnf}
.endfor .endfor
.if !empty(_${group}CONFS) .if !empty(_${group}CONFS)
stage_files.${group}: ${_${group}CONFS} stage_files.${group}: ${_${group}CONFS}
stage_config: stage_files.${group}
installconfig: _${group}INS installconfig: _${group}INS
_${group}INS: ${_${group}CONFS} _${group}INS: ${_${group}CONFS}
@ -76,8 +74,12 @@ _${group}INS: ${_${group}CONFS}
.endif # !target(installconfig) .endif # !target(installconfig)
.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD) .if ${MK_STAGING} != "no"
.if !defined(NO_STAGE_CONFIG) .if !empty(STAGE_SETS)
STAGE_TARGETS+= stage_config buildconfig: stage_files
.if !empty(STAGE_AS_SETS)
buildconfig: stage_as
.endif .endif
.endif .endif
.endif