Date: Fri, 25 Sep 2015 05:15:28 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288210 - head/share/mk Message-ID: <201509250515.t8P5FSbJ045019@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Sep 25 05:15:27 2015 New Revision: 288210 URL: https://svnweb.freebsd.org/changeset/base/288210 Log: 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 Modified: head/share/mk/bsd.files.mk head/share/mk/bsd.incs.mk Modified: head/share/mk/bsd.files.mk ============================================================================== --- head/share/mk/bsd.files.mk Fri Sep 25 03:54:10 2015 (r288209) +++ head/share/mk/bsd.files.mk Fri Sep 25 05:15:27 2015 (r288210) @@ -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} Modified: head/share/mk/bsd.incs.mk ============================================================================== --- head/share/mk/bsd.incs.mk Fri Sep 25 03:54:10 2015 (r288209) +++ head/share/mk/bsd.incs.mk Fri Sep 25 05:15:27 2015 (r288210) @@ -42,10 +42,12 @@ ${group}NAME_${header:T}?= ${${group}NAM .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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509250515.t8P5FSbJ045019>