From owner-svn-src-all@FreeBSD.ORG  Tue Mar 26 20:32:46 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E9F56EA;
 Tue, 26 Mar 2013 20:32:46 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DD0ACD95;
 Tue, 26 Mar 2013 20:32:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QKWkNB001255;
 Tue, 26 Mar 2013 20:32:46 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QKWkuT001254;
 Tue, 26 Mar 2013 20:32:46 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201303262032.r2QKWkuT001254@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 26 Mar 2013 20:32:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248753 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Mar 2013 20:32:47 -0000

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)