diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-27 01:29:38 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-27 01:29:38 +0000 |
| commit | a4a0534f00e8a7e9982b25ec8ce112e8d47696f7 (patch) | |
| tree | 709e1b62c3bfd8cbf5848fcbb48fa2b5270bc63c /share/mk | |
| parent | 248fec0cc6c6b5ab1181c831ff3516b1a3542863 (diff) | |
| download | FreeBSD-src-a4a0534f00e8a7e9982b25ec8ce112e8d47696f7.zip FreeBSD-src-a4a0534f00e8a7e9982b25ec8ce112e8d47696f7.tar.gz | |
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
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.confs.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index 310fe52..c3e9980 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -44,7 +44,6 @@ STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}} # 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 + |
