Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Feb 2013 01:14:27 +0000 (UTC)
From:      "Simon J. Gerraty" <sjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r246864 - projects/bmake/share/mk
Message-ID:  <201302160114.r1G1ER3B075059@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302160114.r1G1ER3B075059>