From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 23 00:47:44 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 4F3D1307;
 Wed, 23 Jan 2013 00:47:44 +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 2C705F3A;
 Wed, 23 Jan 2013 00:47:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0N0liRX081817;
 Wed, 23 Jan 2013 00:47:44 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0N0liDO081816;
 Wed, 23 Jan 2013 00:47:44 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201301230047.r0N0liDO081816@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 23 Jan 2013 00:47:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245830 - 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: Wed, 23 Jan 2013 00:47:44 -0000

Author: sjg
Date: Wed Jan 23 00:47:43 2013
New Revision: 245830
URL: http://svnweb.freebsd.org/changeset/base/245830

Log:
  If PROGNAME is set, we need to use stage_as rather than stage_files
  to control the name in the stage tree.

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

Modified: projects/bmake/share/mk/bsd.prog.mk
==============================================================================
--- projects/bmake/share/mk/bsd.prog.mk	Wed Jan 23 00:46:53 2013	(r245829)
+++ projects/bmake/share/mk/bsd.prog.mk	Wed Jan 23 00:47:43 2013	(r245830)
@@ -241,12 +241,24 @@ stage_files stage_as:
 .else
 # normally only libs and includes are staged
 .if ${MK_STAGING_PROG:Uno} != "no"
-STAGE_SETS+= prog
 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_files
+all: stage_as
+.endif
+.else
+STAGE_SETS+= prog
 stage_files.prog: ${PROG}
+.if !empty(PROG)
+all: stage_files
 .endif
+.endif
+
 .if !empty(SYMLINKS)
 all:   stage_symlinks
 STAGE_SYMLINKS.prog= ${SYMLINKS}