From owner-svn-src-projects@FreeBSD.ORG  Thu Nov  8 21:40:06 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 43090D7B;
 Thu,  8 Nov 2012 21:40:06 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 29C648FC17;
 Thu,  8 Nov 2012 21:40:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8Le6ZO029403;
 Thu, 8 Nov 2012 21:40:06 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8Le6vU029402;
 Thu, 8 Nov 2012 21:40:06 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201211082140.qA8Le6vU029402@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 8 Nov 2012 21:40:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242801 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Nov 2012 21:40:06 -0000

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