From b1eb0fa2de44b2b310260739ea462c5f96db7b27 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 16 Feb 2013 01:14:27 +0000
Subject: tweak STAGE_SETS

---
 share/mk/bsd.prog.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 3340394de119..758756992046 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -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>
-- 
cgit v1.2.3