summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2013-03-26 20:32:46 +0000
committeremaste <emaste@FreeBSD.org>2013-03-26 20:32:46 +0000
commit8712b8a346f61cb453edaadb0db8bf926c7b8f39 (patch)
treecc8ef1a5697b7c10a9da49f7067880b0a2d95831 /share/mk
parent996e9d6f74ed4e1c53add8e632267a708a15c09b (diff)
downloadFreeBSD-src-8712b8a346f61cb453edaadb0db8bf926c7b8f39.zip
FreeBSD-src-8712b8a346f61cb453edaadb0db8bf926c7b8f39.tar.gz
Always define and use PROGNAME
This avoids having separate cases in the install rule for PROGNAME set and not set. This is a minor cleanup in advance of further support for standalone debug files.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.prog.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 5ceafcc..0991915 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -41,6 +41,7 @@ PROG= ${PROG_CXX}
.endif
.if defined(PROG)
+PROGNAME?= ${PROG}
.if defined(SRCS)
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
@@ -153,13 +154,8 @@ realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
-.if defined(PROGNAME)
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-.else
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
-.endif
.endif
.endif # !target(realinstall)
OpenPOWER on IntegriCloud