diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-25 05:15:27 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-25 05:15:27 +0000 |
| commit | 99f1862333607a2b0854bc63042bc935de2bd69b (patch) | |
| tree | b50222488a379e40b6e4221fefb97cd4027070fa /share/mk/bsd.files.mk | |
| parent | 003e64c1ef50801871085508d8bece381a7b8823 (diff) | |
| download | FreeBSD-src-99f1862333607a2b0854bc63042bc935de2bd69b.zip FreeBSD-src-99f1862333607a2b0854bc63042bc935de2bd69b.tar.gz | |
META_MODE: Fix staging not respecting _DIR overrides.
This fixes atf-c.h not properly being installed to /usr/include/ (in
the stagedir) via its override of 'INCSDIR_atf-c.h= ${INCLUDEDIR}'.
This fixes building things that depend on atf.
Staging seems to ignore OWN/GRP/MODE settings and needs further exploration.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/mk/bsd.files.mk')
| -rw-r--r-- | share/mk/bsd.files.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index 1c957fc..b9379d9 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -47,10 +47,12 @@ ${group}NAME_${file:T}?= ${${group}NAME} ${group}NAME_${file:T}?= ${file:T} .endif .if !make(buildincludes) -STAGE_AS_SETS+= ${group} +STAGE_AS_SETS+= ${file:T} .endif STAGE_AS_${file:T}= ${${group}NAME_${file:T}} -stage_as.${group}: ${file} +# XXX {group}OWN,GRP,MODE +STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}} +stage_as.${file:T}: ${file} installfiles-${group}: _${group}INS_${file:T} _${group}INS_${file:T}: ${file} |
