From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 29 00:07:55 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5F2E35A2;
 Tue, 29 Jan 2013 00:07:55 +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 479308CF;
 Tue, 29 Jan 2013 00:07:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0T07tcF072712;
 Tue, 29 Jan 2013 00:07:55 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0T07tlT072711;
 Tue, 29 Jan 2013 00:07:55 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201301290007.r0T07tlT072711@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Tue, 29 Jan 2013 00:07:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246046 - 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: Tue, 29 Jan 2013 00:07:55 -0000

Author: sjg
Date: Tue Jan 29 00:07:54 2013
New Revision: 246046
URL: http://svnweb.freebsd.org/changeset/base/246046

Log:
  Handle staging SYMKINKS and LINKS better

Modified:
  projects/bmake/share/mk/bsd.prog.mk

Modified: projects/bmake/share/mk/bsd.prog.mk
==============================================================================
--- projects/bmake/share/mk/bsd.prog.mk	Mon Jan 28 23:16:47 2013	(r246045)
+++ projects/bmake/share/mk/bsd.prog.mk	Tue Jan 29 00:07:54 2013	(r246046)
@@ -177,6 +177,10 @@ SCRIPTSOWN?=	${BINOWN}
 SCRIPTSGRP?=	${BINGRP}
 SCRIPTSMODE?=	${BINMODE}
 
+STAGE_AS_SETS+= scripts
+stage_as.scripts: ${SCRIPTS}
+FLAGS.stage_as.scripts= -m ${SCRIPTSMODE}
+STAGE_FILES_DIR.scripts= ${STAGE_OBJTOP}
 .for script in ${SCRIPTS}
 .if defined(SCRIPTSNAME)
 SCRIPTSNAME_${script:T}?=	${SCRIPTSNAME}
@@ -187,6 +191,7 @@ SCRIPTSDIR_${script:T}?=	${SCRIPTSDIR}
 SCRIPTSOWN_${script:T}?=	${SCRIPTSOWN}
 SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
 SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
+STAGE_AS_${script:T}=		${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}}
 _scriptsinstall: _SCRIPTSINS_${script:T}
 _SCRIPTSINS_${script:T}: ${script}
 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
@@ -242,28 +247,32 @@ stage_files stage_as:
 # normally only libs and includes are staged
 .if ${MK_STAGING_PROG:Uno} != "no"
 STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
-STAGE_SYMLINKS_DIR.prog= ${STAGE_OBJTOP}
 
 .if defined(PROGNAME)
 STAGE_AS_SETS+= prog
 STAGE_AS_${PROG}= ${PROGNAME}
 stage_as.prog: ${PROG}
-.if !empty(PROG)
-all: stage_as
-.endif
 .else
 STAGE_SETS+= prog
 stage_files.prog: ${PROG}
-.if !empty(PROG)
-all: stage_files
-.endif
 .endif
 
+.if !empty(LINKS)
+all: stage_links
+STAGE_LINKS.prog= ${LINKS}
+.endif
 .if !empty(SYMLINKS)
-all:   stage_symlinks
+all: stage_symlinks
 STAGE_SYMLINKS.prog= ${SYMLINKS}
 .endif
 
+.if !empty(STAGE_AS_SETS)
+all: stage_as
+.endif
+.if !empty(STAGE_SETS)
+all: stage_files
+.endif
+
 .endif
 .include <meta.stage.mk>
 .endif