Date: Thu, 8 Nov 2012 21:40:06 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242801 - projects/bmake/share/mk Message-ID: <201211082140.qA8Le6vU029402@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Thu Nov 8 21:40:05 2012 New Revision: 242801 URL: http://svnweb.freebsd.org/changeset/base/242801 Log: defined(${group}NAME) is also a trigger for special handling Modified: projects/bmake/share/mk/bsd.incs.mk Modified: projects/bmake/share/mk/bsd.incs.mk ============================================================================== --- projects/bmake/share/mk/bsd.incs.mk Thu Nov 8 21:39:00 2012 (r242800) +++ projects/bmake/share/mk/bsd.incs.mk Thu Nov 8 21:40:05 2012 (r242801) @@ -31,7 +31,7 @@ _${group}INCS= .for header in ${${group}} .if defined(${group}OWN_${header:T}) || defined(${group}GRP_${header:T}) || \ defined(${group}MODE_${header:T}) || defined(${group}DIR_${header:T}) || \ - defined(${group}NAME_${header:T}) + defined(${group}NAME_${header:T}) || defined(${group}NAME) ${group}OWN_${header:T}?= ${${group}OWN} ${group}GRP_${header:T}?= ${${group}GRP} ${group}MODE_${header:T}?= ${${group}MODE} @@ -89,13 +89,17 @@ installincludes: realinstall: installincludes .ORDER: beforeinstall installincludes -.if ${MK_STAGING} != "no" +.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD) .if !target(stage_includes) .if !empty(STAGE_SETS) buildincludes: stage_files .if !empty(STAGE_AS_SETS) buildincludes: stage_as .endif +.if !empty(INCSLINKS) +stage_files: stage_symlinks +STAGE_SYMLINKS.INCS= ${INCSLINKS:S,${INCSDIR}/,,} +.endif .endif .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211082140.qA8Le6vU029402>