From owner-svn-src-projects@FreeBSD.ORG  Sat Feb 16 01:14:27 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C95B3A23;
 Sat, 16 Feb 2013 01:14:27 +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 B282219F;
 Sat, 16 Feb 2013 01:14:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1ER3F075060;
 Sat, 16 Feb 2013 01:14:27 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1ER3B075059;
 Sat, 16 Feb 2013 01:14:27 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201302160114.r1G1ER3B075059@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 16 Feb 2013 01:14:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246864 - 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: Sat, 16 Feb 2013 01:14:27 -0000

Author: sjg
Date: Sat Feb 16 01:14:27 2013
New Revision: 246864
URL: http://svnweb.freebsd.org/changeset/base/246864

Log:
  tweak STAGE_SETS

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

Modified: projects/bmake/share/mk/bsd.prog.mk
==============================================================================
--- projects/bmake/share/mk/bsd.prog.mk	Sat Feb 16 01:13:30 2013	(r246863)
+++ projects/bmake/share/mk/bsd.prog.mk	Sat Feb 16 01:14:27 2013	(r246864)
@@ -247,6 +247,7 @@ stage_files stage_as:
 .if ${MK_STAGING_PROG:Uno} != "no"
 STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
 
+.if !empty(PROG)
 .if defined(PROGNAME)
 STAGE_AS_SETS+= prog
 STAGE_AS_${PROG}= ${PROGNAME}
@@ -254,23 +255,24 @@ stage_as.prog: ${PROG}
 .else
 STAGE_SETS+= prog
 stage_files.prog: ${PROG}
+all: stage_files
+.endif
 .endif
 
 .if !empty(LINKS)
 all: stage_links
+STAGE_SETS+= prog
 STAGE_LINKS.prog= ${LINKS}
 .endif
 .if !empty(SYMLINKS)
 all: stage_symlinks
+STAGE_SETS+= prog
 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>