summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-02-16 01:14:27 +0000
committersjg <sjg@FreeBSD.org>2013-02-16 01:14:27 +0000
commit78e36291990929a67ec5ea508c8b22a22165f3d9 (patch)
tree242d2bc54dfd5c89dec9e9837b7f678bc4d7fbf1
parentf3309ae7170469adc9fc62d83199c7f481347fb3 (diff)
downloadFreeBSD-src-78e36291990929a67ec5ea508c8b22a22165f3d9.zip
FreeBSD-src-78e36291990929a67ec5ea508c8b22a22165f3d9.tar.gz
tweak STAGE_SETS
-rw-r--r--share/mk/bsd.prog.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 3340394..7587569 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>
OpenPOWER on IntegriCloud