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.incs.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.incs.mk')
| -rw-r--r-- | share/mk/bsd.incs.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index e1e0a4a..1c178b0 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -42,10 +42,12 @@ ${group}NAME_${header:T}?= ${${group}NAME} .else ${group}NAME_${header:T}?= ${header:T} .endif -STAGE_AS_SETS+= ${group} +STAGE_AS_SETS+= ${header:T} STAGE_AS_${header:T}= ${${group}NAME_${header:T}} -stage_as.${group}: ${header} -stage_includes: stage_as.${group} +# XXX {group}OWN,GRP,MODE +STAGE_DIR.${header:T}= ${STAGE_OBJTOP}${${group}DIR_${header:T}} +stage_as.${header:T}: ${header} +stage_includes: stage_as.${header:T} installincludes: _${group}INS_${header:T} _${group}INS_${header:T}: ${header} |
