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

This commit is contained in:

Bryan Drewery

2015-09-25 05:15:27 +00:00

parent d7b87b89b7

commit 509301d918

2 changed files with 9 additions and 5 deletions

									
										share/mk/bsd.incs.mk
									
		+5
		-3
	
												View File
												
				@@ -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}