From owner-svn-src-head@freebsd.org  Fri Sep 18 22:28:14 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BD8DA01160;
 Fri, 18 Sep 2015 22:28:14 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CEAD1075;
 Fri, 18 Sep 2015 22:28:14 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8IMSEx8009768;
 Fri, 18 Sep 2015 22:28:14 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8IMSEOB009765;
 Fri, 18 Sep 2015 22:28:14 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509182228.t8IMSEOB009765@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 18 Sep 2015 22:28:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287975 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Sep 2015 22:28:14 -0000

Author: bdrewery
Date: Fri Sep 18 22:28:13 2015
New Revision: 287975
URL: https://svnweb.freebsd.org/changeset/base/287975

Log:
  Garbage collect _SHLIBDIRPREFIX leftovers from r284898.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.lib.mk
  head/share/mk/bsd.sys.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Fri Sep 18 22:26:25 2015	(r287974)
+++ head/share/mk/bsd.lib.mk	Fri Sep 18 22:28:13 2015	(r287975)
@@ -214,9 +214,8 @@ ${SHLIB_NAME_FULL}: beforelinking
 .endif
 
 .if defined(SHLIB_LINK)
-# ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building
-# and when building 32 bits library shims.  ${_SHLIBDIRPREFIX} is the directory
-# prefix where shared objects will be installed by the install target.
+# ${_LDSCRIPTROOT} is needed when cross-building
+# and when building 32 bits library shims.
 #
 # ${_LDSCRIPTROOT} is the directory prefix that will be used when generating
 # ld(1) scripts.  The crosstools' ld is configured to lookup libraries in an

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Fri Sep 18 22:26:25 2015	(r287974)
+++ head/share/mk/bsd.sys.mk	Fri Sep 18 22:28:13 2015	(r287975)
@@ -186,7 +186,6 @@ staging stage_libs stage_files stage_as 
 .else
 # allow targets like beforeinstall to be leveraged
 DESTDIR= ${STAGE_OBJTOP}
-_SHLIBDIRPREFIX= ${STAGE_OBJTOP}
 
 .if commands(beforeinstall)
 .if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"