From 99f1862333607a2b0854bc63042bc935de2bd69b Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Fri, 25 Sep 2015 05:15:27 +0000
Subject: 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
---
 share/mk/bsd.files.mk | 6 ++++--
 share/mk/bsd.incs.mk  | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'share/mk')

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}
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}
-- 
cgit v1.1