svn commit: r248753 - head/share/mk

[Ed Maste]

Author: emaste
Date: Tue Mar 26 20:32:46 2013
New Revision: 248753
URL: http://svnweb.freebsd.org/changeset/base/248753

Log:
  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.

Modified:
  head/share/mk/bsd.prog.mk

Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk	Tue Mar 26 20:17:08 2013	(r248752)
+++ head/share/mk/bsd.prog.mk	Tue Mar 26 20:32:46 2013	(r248753)
@@ -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)