From owner-svn-src-stable@freebsd.org  Fri Jun 23 19:44:21 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 E575CD8881C;
 Fri, 23 Jun 2017 19:44:21 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 AD63471DDD;
 Fri, 23 Jun 2017 19:44:21 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5NJiK9v093876;
 Fri, 23 Jun 2017 19:44:20 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NJiKTn093872;
 Fri, 23 Jun 2017 19:44:20 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706231944.v5NJiKTn093872@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, 23 Jun 2017 19:44:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r320294 - stable/11/share/mk
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2017 19:44:22 -0000

Author: bdrewery
Date: Fri Jun 23 19:44:20 2017
New Revision: 320294
URL: https://svnweb.freebsd.org/changeset/base/320294

Log:
  MFC r320012,r320028,r320061,r320118:
  
    r320012:
      Fix LIBAMU location to fix 'stale .depend' rebuilds in usr.sbin/amd.
    r320028:
      Fix more incorrect library directories fix 'stale .depend' rebuilds.
    r320061:
      Fix Makefiles which override LIBDIR to not add incorrect dependencies into
      .depend.
    r320118:
      Follow-up r320061: Need to respect make.conf/env LIBDIR overrides.
  
  Approved by:	re (gjb)

Modified:
  stable/11/share/mk/bsd.libnames.mk
  stable/11/share/mk/bsd.own.mk
  stable/11/share/mk/local.sys.mk
  stable/11/share/mk/src.libnames.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/bsd.libnames.mk
==============================================================================
--- stable/11/share/mk/bsd.libnames.mk	Fri Jun 23 19:04:40 2017	(r320293)
+++ stable/11/share/mk/bsd.libnames.mk	Fri Jun 23 19:44:20 2017	(r320294)
@@ -12,161 +12,161 @@
 
 # Src directory locations are also defined in src.libnames.mk.
 
-LIBCRT0?=	${DESTDIR}${LIBDIR}/crt0.o
+LIBCRT0?=	${DESTDIR}${LIBDIR_BASE}/crt0.o
 
-LIB80211?=	${DESTDIR}${LIBDIR}/lib80211.a
-LIBALIAS?=	${DESTDIR}${LIBDIR}/libalias.a
-LIBARCHIVE?=	${DESTDIR}${LIBDIR}/libarchive.a
-LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a
-LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
-LIBAUDITD?=	${DESTDIR}${LIBDIR}/libauditd.a
-LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
-LIBBEGEMOT?=	${DESTDIR}${LIBDIR}/libbegemot.a
-LIBBLACKLIST?=	${DESTDIR}${LIBDIR}/libblacklist.a
-LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
-LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
-LIBBSM?=	${DESTDIR}${LIBDIR}/libbsm.a
-LIBBSNMP?=	${DESTDIR}${LIBDIR}/libbsnmp.a
-LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a
-LIBC?=		${DESTDIR}${LIBDIR}/libc.a
-LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
-LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
-LIBCAP_DNS?=	${DESTDIR}${LIBDIR}/libcap_dns.a
-LIBCAP_GRP?=	${DESTDIR}${LIBDIR}/libcap_grp.a
-LIBCAP_PWD?=	${DESTDIR}${LIBDIR}/libcap_pwd.a
-LIBCAP_RANDOM?=	${DESTDIR}${LIBDIR}/libcap_random.a
-LIBCAP_SYSCTL?=	${DESTDIR}${LIBDIR}/libcap_sysctl.a
-LIBCASPER?=	${DESTDIR}${LIBDIR}/libcasper.a
-LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
-LIBCOMPILER_RT?=${DESTDIR}${LIBDIR}/libcompiler_rt.a
-LIBCOM_ERR?=	${DESTDIR}${LIBDIR}/libcom_err.a
-LIBCPLUSPLUS?=	${DESTDIR}${LIBDIR}/libc++.a
-LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.a
-LIBCRYPTO?=	${DESTDIR}${LIBDIR}/libcrypto.a
-LIBCTF?=	${DESTDIR}${LIBDIR}/libctf.a
-LIBCURSES?=	${DESTDIR}${LIBDIR}/libcurses.a
-LIBCUSE?=	${DESTDIR}${LIBDIR}/libcuse.a
-LIBCXGB4?=	${DESTDIR}${LIBDIR}/libcxgb4.a
-LIBCXXRT?=	${DESTDIR}${LIBDIR}/libcxxrt.a
-LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
-LIBDEVCTL?=	${DESTDIR}${LIBDIR}/libdevctl.a
-LIBDEVDCTL?=	${DESTDIR}${LIBDIR}/libdevdctl.a
-LIBDEVINFO?=	${DESTDIR}${LIBDIR}/libdevinfo.a
-LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevstat.a
-LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a
-LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
-LIBDPV?=	${DESTDIR}${LIBDIR}/libdpv.a
-LIBDTRACE?=	${DESTDIR}${LIBDIR}/libdtrace.a
-LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
-LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
-LIBEFIVAR?=	${DESTDIR}${LIBDIR}/libefivar.a
-LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
-LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
-LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
-LIBFIGPAR?=	${DESTDIR}${LIBDIR}/libfigpar.a
+LIB80211?=	${DESTDIR}${LIBDIR_BASE}/lib80211.a
+LIBALIAS?=	${DESTDIR}${LIBDIR_BASE}/libalias.a
+LIBARCHIVE?=	${DESTDIR}${LIBDIR_BASE}/libarchive.a
+LIBASN1?=	${DESTDIR}${LIBDIR_BASE}/libasn1.a
+LIBATM?=	${DESTDIR}${LIBDIR_BASE}/libatm.a
+LIBAUDITD?=	${DESTDIR}${LIBDIR_BASE}/libauditd.a
+LIBAVL?=	${DESTDIR}${LIBDIR_BASE}/libavl.a
+LIBBEGEMOT?=	${DESTDIR}${LIBDIR_BASE}/libbegemot.a
+LIBBLACKLIST?=	${DESTDIR}${LIBDIR_BASE}/libblacklist.a
+LIBBLUETOOTH?=	${DESTDIR}${LIBDIR_BASE}/libbluetooth.a
+LIBBSDXML?=	${DESTDIR}${LIBDIR_BASE}/libbsdxml.a
+LIBBSM?=	${DESTDIR}${LIBDIR_BASE}/libbsm.a
+LIBBSNMP?=	${DESTDIR}${LIBDIR_BASE}/libbsnmp.a
+LIBBZ2?=	${DESTDIR}${LIBDIR_BASE}/libbz2.a
+LIBC?=		${DESTDIR}${LIBDIR_BASE}/libc.a
+LIBCALENDAR?=	${DESTDIR}${LIBDIR_BASE}/libcalendar.a
+LIBCAM?=	${DESTDIR}${LIBDIR_BASE}/libcam.a
+LIBCAP_DNS?=	${DESTDIR}${LIBDIR_BASE}/libcap_dns.a
+LIBCAP_GRP?=	${DESTDIR}${LIBDIR_BASE}/libcap_grp.a
+LIBCAP_PWD?=	${DESTDIR}${LIBDIR_BASE}/libcap_pwd.a
+LIBCAP_RANDOM?=	${DESTDIR}${LIBDIR_BASE}/libcap_random.a
+LIBCAP_SYSCTL?=	${DESTDIR}${LIBDIR_BASE}/libcap_sysctl.a
+LIBCASPER?=	${DESTDIR}${LIBDIR_BASE}/libcasper.a
+LIBCOMPAT?=	${DESTDIR}${LIBDIR_BASE}/libcompat.a
+LIBCOMPILER_RT?=${DESTDIR}${LIBDIR_BASE}/libcompiler_rt.a
+LIBCOM_ERR?=	${DESTDIR}${LIBDIR_BASE}/libcom_err.a
+LIBCPLUSPLUS?=	${DESTDIR}${LIBDIR_BASE}/libc++.a
+LIBCRYPT?=	${DESTDIR}${LIBDIR_BASE}/libcrypt.a
+LIBCRYPTO?=	${DESTDIR}${LIBDIR_BASE}/libcrypto.a
+LIBCTF?=	${DESTDIR}${LIBDIR_BASE}/libctf.a
+LIBCURSES?=	${DESTDIR}${LIBDIR_BASE}/libcurses.a
+LIBCUSE?=	${DESTDIR}${LIBDIR_BASE}/libcuse.a
+LIBCXGB4?=	${DESTDIR}${LIBDIR_BASE}/libcxgb4.a
+LIBCXXRT?=	${DESTDIR}${LIBDIR_BASE}/libcxxrt.a
+LIBC_PIC?=	${DESTDIR}${LIBDIR_BASE}/libc_pic.a
+LIBDEVCTL?=	${DESTDIR}${LIBDIR_BASE}/libdevctl.a
+LIBDEVDCTL?=	${DESTDIR}${LIBDIR_BASE}/libdevdctl.a
+LIBDEVINFO?=	${DESTDIR}${LIBDIR_BASE}/libdevinfo.a
+LIBDEVSTAT?=	${DESTDIR}${LIBDIR_BASE}/libdevstat.a
+LIBDIALOG?=	${DESTDIR}${LIBDIR_BASE}/libdialog.a
+LIBDNS?=	${DESTDIR}${LIBDIR_BASE}/libdns.a
+LIBDPV?=	${DESTDIR}${LIBDIR_BASE}/libdpv.a
+LIBDTRACE?=	${DESTDIR}${LIBDIR_BASE}/libdtrace.a
+LIBDWARF?=	${DESTDIR}${LIBDIR_BASE}/libdwarf.a
+LIBEDIT?=	${DESTDIR}${LIBDIR_BASE}/libedit.a
+LIBEFIVAR?=	${DESTDIR}${LIBDIR_BASE}/libefivar.a
+LIBELF?=	${DESTDIR}${LIBDIR_BASE}/libelf.a
+LIBEXECINFO?=	${DESTDIR}${LIBDIR_BASE}/libexecinfo.a
+LIBFETCH?=	${DESTDIR}${LIBDIR_BASE}/libfetch.a
+LIBFIGPAR?=	${DESTDIR}${LIBDIR_BASE}/libfigpar.a
 LIBFL?=		"don't use LIBFL, use LIBL"
-LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
-LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-LIBGEOM?=	${DESTDIR}${LIBDIR}/libgeom.a
-LIBGNUREGEX?=	${DESTDIR}${LIBDIR}/libgnuregex.a
-LIBGPIO?=	${DESTDIR}${LIBDIR}/libgpio.a
-LIBGSSAPI?=	${DESTDIR}${LIBDIR}/libgssapi.a
-LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a
-LIBHDB?=	${DESTDIR}${LIBDIR}/libhdb.a
-LIBHEIMBASE?=	${DESTDIR}${LIBDIR}/libheimbase.a
-LIBHEIMNTLM?=	${DESTDIR}${LIBDIR}/libheimntlm.a
-LIBHEIMSQLITE?=	${DESTDIR}${LIBDIR}/libheimsqlite.a
-LIBHX509?=	${DESTDIR}${LIBDIR}/libhx509.a
-LIBIBCM?=	${DESTDIR}${LIBDIR}/libibcm.a
-LIBIBCOMMON?=	${DESTDIR}${LIBDIR}/libibcommon.a
-LIBIBMAD?=	${DESTDIR}${LIBDIR}/libibmad.a
-LIBIBSDP?=	${DESTDIR}${LIBDIR}/libibsdp.a
-LIBIBUMAD?=	${DESTDIR}${LIBDIR}/libibumad.a
-LIBIBVERBS?=	${DESTDIR}${LIBDIR}/libibverbs.a
-LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
-LIBJAIL?=	${DESTDIR}${LIBDIR}/libjail.a
-LIBKADM5CLNT?=	${DESTDIR}${LIBDIR}/libkadm5clnt.a
-LIBKADM5SRV?=	${DESTDIR}${LIBDIR}/libkadm5srv.a
-LIBKAFS5?=	${DESTDIR}${LIBDIR}/libkafs5.a
-LIBKDC?=	${DESTDIR}${LIBDIR}/libkdc.a
-LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
-LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
-LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
-LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
-LIBL?=		${DESTDIR}${LIBDIR}/libl.a
+LIBFORM?=	${DESTDIR}${LIBDIR_BASE}/libform.a
+LIBG2C?=	${DESTDIR}${LIBDIR_BASE}/libg2c.a
+LIBGEOM?=	${DESTDIR}${LIBDIR_BASE}/libgeom.a
+LIBGNUREGEX?=	${DESTDIR}${LIBDIR_BASE}/libgnuregex.a
+LIBGPIO?=	${DESTDIR}${LIBDIR_BASE}/libgpio.a
+LIBGSSAPI?=	${DESTDIR}${LIBDIR_BASE}/libgssapi.a
+LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR_BASE}/libgssapi_krb5.a
+LIBHDB?=	${DESTDIR}${LIBDIR_BASE}/libhdb.a
+LIBHEIMBASE?=	${DESTDIR}${LIBDIR_BASE}/libheimbase.a
+LIBHEIMNTLM?=	${DESTDIR}${LIBDIR_BASE}/libheimntlm.a
+LIBHEIMSQLITE?=	${DESTDIR}${LIBDIR_BASE}/libheimsqlite.a
+LIBHX509?=	${DESTDIR}${LIBDIR_BASE}/libhx509.a
+LIBIBCM?=	${DESTDIR}${LIBDIR_BASE}/libibcm.a
+LIBIBCOMMON?=	${DESTDIR}${LIBDIR_BASE}/libibcommon.a
+LIBIBMAD?=	${DESTDIR}${LIBDIR_BASE}/libibmad.a
+LIBIBSDP?=	${DESTDIR}${LIBDIR_BASE}/libibsdp.a
+LIBIBUMAD?=	${DESTDIR}${LIBDIR_BASE}/libibumad.a
+LIBIBVERBS?=	${DESTDIR}${LIBDIR_BASE}/libibverbs.a
+LIBIPSEC?=	${DESTDIR}${LIBDIR_BASE}/libipsec.a
+LIBJAIL?=	${DESTDIR}${LIBDIR_BASE}/libjail.a
+LIBKADM5CLNT?=	${DESTDIR}${LIBDIR_BASE}/libkadm5clnt.a
+LIBKADM5SRV?=	${DESTDIR}${LIBDIR_BASE}/libkadm5srv.a
+LIBKAFS5?=	${DESTDIR}${LIBDIR_BASE}/libkafs5.a
+LIBKDC?=	${DESTDIR}${LIBDIR_BASE}/libkdc.a
+LIBKEYCAP?=	${DESTDIR}${LIBDIR_BASE}/libkeycap.a
+LIBKICONV?=	${DESTDIR}${LIBDIR_BASE}/libkiconv.a
+LIBKRB5?=	${DESTDIR}${LIBDIR_BASE}/libkrb5.a
+LIBKVM?=	${DESTDIR}${LIBDIR_BASE}/libkvm.a
+LIBL?=		${DESTDIR}${LIBDIR_BASE}/libl.a
 LIBLN?=		"don't use LIBLN, use LIBL"
-LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
-LIBM?=		${DESTDIR}${LIBDIR}/libm.a
-LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
-LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
-LIBMEMSTAT?=	${DESTDIR}${LIBDIR}/libmemstat.a
-LIBMENU?=	${DESTDIR}${LIBDIR}/libmenu.a
-LIBMILTER?=	${DESTDIR}${LIBDIR}/libmilter.a
-LIBMLX4?=	${DESTDIR}${LIBDIR}/libmlx4.a
-LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
-LIBMT?=		${DESTDIR}${LIBDIR}/libmt.a
-LIBMTHCA?=	${DESTDIR}${LIBDIR}/libmthca.a
-LIBNANDFS?=	${DESTDIR}${LIBDIR}/libnandfs.a
-LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
-LIBNCURSESW?=	${DESTDIR}${LIBDIR}/libncursesw.a
-LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a
-LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
-LIBNV?=		${DESTDIR}${LIBDIR}/libnv.a
-LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
-LIBOPENSM?=	${DESTDIR}${LIBDIR}/libopensm.a
-LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
-LIBOSMCOMP?=	${DESTDIR}${LIBDIR}/libosmcomp.a
-LIBOSMVENDOR?=	${DESTDIR}${LIBDIR}/libosmvendor.a
-LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
-LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
-LIBPANELW?=	${DESTDIR}${LIBDIR}/libpanelw.a
-LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
-LIBPJDLOG?=	${DESTDIR}${LIBDIR}/libpjdlog.a
-LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
-LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
-LIBPROCSTAT?=	${DESTDIR}${LIBDIR}/libprocstat.a
-LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
-LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
-LIBRDMACM?=	${DESTDIR}${LIBDIR}/librdmacm.a
-LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a
-LIBRPCSEC_GSS?=	${DESTDIR}${LIBDIR}/librpcsec_gss.a
-LIBRPCSVC?=	${DESTDIR}${LIBDIR}/librpcsvc.a
-LIBRT?=		${DESTDIR}${LIBDIR}/librt.a
-LIBRTLD_DB?=	${DESTDIR}${LIBDIR}/librtld_db.a
-LIBSBUF?=	${DESTDIR}${LIBDIR}/libsbuf.a
-LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
-LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
-LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
-LIBSSP_NONSHARED?=	${DESTDIR}${LIBDIR}/libssp_nonshared.a
-LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
-LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
-LIBSTDTHREADS?=	${DESTDIR}${LIBDIR}/libstdthreads.a
-LIBSYSDECODE?=	${DESTDIR}${LIBDIR}/libsysdecode.a
-LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a
-LIBTERMCAP?=	${DESTDIR}${LIBDIR}/libtermcap.a
-LIBTERMCAPW?=	${DESTDIR}${LIBDIR}/libtermcapw.a
+LIBLZMA?=	${DESTDIR}${LIBDIR_BASE}/liblzma.a
+LIBM?=		${DESTDIR}${LIBDIR_BASE}/libm.a
+LIBMAGIC?=	${DESTDIR}${LIBDIR_BASE}/libmagic.a
+LIBMD?=		${DESTDIR}${LIBDIR_BASE}/libmd.a
+LIBMEMSTAT?=	${DESTDIR}${LIBDIR_BASE}/libmemstat.a
+LIBMENU?=	${DESTDIR}${LIBDIR_BASE}/libmenu.a
+LIBMILTER?=	${DESTDIR}${LIBDIR_BASE}/libmilter.a
+LIBMLX4?=	${DESTDIR}${LIBDIR_BASE}/libmlx4.a
+LIBMP?=		${DESTDIR}${LIBDIR_BASE}/libmp.a
+LIBMT?=		${DESTDIR}${LIBDIR_BASE}/libmt.a
+LIBMTHCA?=	${DESTDIR}${LIBDIR_BASE}/libmthca.a
+LIBNANDFS?=	${DESTDIR}${LIBDIR_BASE}/libnandfs.a
+LIBNCURSES?=	${DESTDIR}${LIBDIR_BASE}/libncurses.a
+LIBNCURSESW?=	${DESTDIR}${LIBDIR_BASE}/libncursesw.a
+LIBNETGRAPH?=	${DESTDIR}${LIBDIR_BASE}/libnetgraph.a
+LIBNGATM?=	${DESTDIR}${LIBDIR_BASE}/libngatm.a
+LIBNV?=		${DESTDIR}${LIBDIR_BASE}/libnv.a
+LIBNVPAIR?=	${DESTDIR}${LIBDIR_BASE}/libnvpair.a
+LIBOPENSM?=	${DESTDIR}${LIBDIR_BASE}/libopensm.a
+LIBOPIE?=	${DESTDIR}${LIBDIR_BASE}/libopie.a
+LIBOSMCOMP?=	${DESTDIR}${LIBDIR_BASE}/libosmcomp.a
+LIBOSMVENDOR?=	${DESTDIR}${LIBDIR_BASE}/libosmvendor.a
+LIBPAM?=	${DESTDIR}${LIBDIR_BASE}/libpam.a
+LIBPANEL?=	${DESTDIR}${LIBDIR_BASE}/libpanel.a
+LIBPANELW?=	${DESTDIR}${LIBDIR_BASE}/libpanelw.a
+LIBPCAP?=	${DESTDIR}${LIBDIR_BASE}/libpcap.a
+LIBPJDLOG?=	${DESTDIR}${LIBDIR_BASE}/libpjdlog.a
+LIBPMC?=	${DESTDIR}${LIBDIR_BASE}/libpmc.a
+LIBPROC?=	${DESTDIR}${LIBDIR_BASE}/libproc.a
+LIBPROCSTAT?=	${DESTDIR}${LIBDIR_BASE}/libprocstat.a
+LIBPTHREAD?=	${DESTDIR}${LIBDIR_BASE}/libpthread.a
+LIBRADIUS?=	${DESTDIR}${LIBDIR_BASE}/libradius.a
+LIBRDMACM?=	${DESTDIR}${LIBDIR_BASE}/librdmacm.a
+LIBROKEN?=	${DESTDIR}${LIBDIR_BASE}/libroken.a
+LIBRPCSEC_GSS?=	${DESTDIR}${LIBDIR_BASE}/librpcsec_gss.a
+LIBRPCSVC?=	${DESTDIR}${LIBDIR_BASE}/librpcsvc.a
+LIBRT?=		${DESTDIR}${LIBDIR_BASE}/librt.a
+LIBRTLD_DB?=	${DESTDIR}${LIBDIR_BASE}/librtld_db.a
+LIBSBUF?=	${DESTDIR}${LIBDIR_BASE}/libsbuf.a
+LIBSDP?=	${DESTDIR}${LIBDIR_BASE}/libsdp.a
+LIBSMB?=	${DESTDIR}${LIBDIR_BASE}/libsmb.a
+LIBSSL?=	${DESTDIR}${LIBDIR_BASE}/libssl.a
+LIBSSP_NONSHARED?=	${DESTDIR}${LIBDIR_BASE}/libssp_nonshared.a
+LIBSTAND?=	${DESTDIR}${LIBDIR_BASE}/libstand.a
+LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR_BASE}/libstdc++.a
+LIBSTDTHREADS?=	${DESTDIR}${LIBDIR_BASE}/libstdthreads.a
+LIBSYSDECODE?=	${DESTDIR}${LIBDIR_BASE}/libsysdecode.a
+LIBTACPLUS?=	${DESTDIR}${LIBDIR_BASE}/libtacplus.a
+LIBTERMCAP?=	${DESTDIR}${LIBDIR_BASE}/libtermcap.a
+LIBTERMCAPW?=	${DESTDIR}${LIBDIR_BASE}/libtermcapw.a
 LIBTERMLIB?=	"don't use LIBTERMLIB, use LIBTERMCAP"
 LIBTINFO?=	"don't use LIBTINFO, use LIBNCURSES"
-LIBUFS?=	${DESTDIR}${LIBDIR}/libufs.a
-LIBUGIDFW?=	${DESTDIR}${LIBDIR}/libugidfw.a
-LIBULOG?=	${DESTDIR}${LIBDIR}/libulog.a
-LIBUMEM?=	${DESTDIR}${LIBDIR}/libumem.a
-LIBUSB?=	${DESTDIR}${LIBDIR}/libusb.a
-LIBUSBHID?=	${DESTDIR}${LIBDIR}/libusbhid.a
-LIBUTIL?=	${DESTDIR}${LIBDIR}/libutil.a
-LIBUUTIL?=	${DESTDIR}${LIBDIR}/libuutil.a
-LIBVGL?=	${DESTDIR}${LIBDIR}/libvgl.a
-LIBVMMAPI?=	${DESTDIR}${LIBDIR}/libvmmapi.a
-LIBWIND?=	${DESTDIR}${LIBDIR}/libwind.a
-LIBWRAP?=	${DESTDIR}${LIBDIR}/libwrap.a
-LIBXO?=		${DESTDIR}${LIBDIR}/libxo.a
-LIBXPG4?=	${DESTDIR}${LIBDIR}/libxpg4.a
-LIBY?=		${DESTDIR}${LIBDIR}/liby.a
-LIBYPCLNT?=	${DESTDIR}${LIBDIR}/libypclnt.a
-LIBZ?=		${DESTDIR}${LIBDIR}/libz.a
-LIBZFS?=	${DESTDIR}${LIBDIR}/libzfs.a
-LIBZFS_CORE?=	${DESTDIR}${LIBDIR}/libzfs_core.a
-LIBZPOOL?=	${DESTDIR}${LIBDIR}/libzpool.a
+LIBUFS?=	${DESTDIR}${LIBDIR_BASE}/libufs.a
+LIBUGIDFW?=	${DESTDIR}${LIBDIR_BASE}/libugidfw.a
+LIBULOG?=	${DESTDIR}${LIBDIR_BASE}/libulog.a
+LIBUMEM?=	${DESTDIR}${LIBDIR_BASE}/libumem.a
+LIBUSB?=	${DESTDIR}${LIBDIR_BASE}/libusb.a
+LIBUSBHID?=	${DESTDIR}${LIBDIR_BASE}/libusbhid.a
+LIBUTIL?=	${DESTDIR}${LIBDIR_BASE}/libutil.a
+LIBUUTIL?=	${DESTDIR}${LIBDIR_BASE}/libuutil.a
+LIBVGL?=	${DESTDIR}${LIBDIR_BASE}/libvgl.a
+LIBVMMAPI?=	${DESTDIR}${LIBDIR_BASE}/libvmmapi.a
+LIBWIND?=	${DESTDIR}${LIBDIR_BASE}/libwind.a
+LIBWRAP?=	${DESTDIR}${LIBDIR_BASE}/libwrap.a
+LIBXO?=		${DESTDIR}${LIBDIR_BASE}/libxo.a
+LIBXPG4?=	${DESTDIR}${LIBDIR_BASE}/libxpg4.a
+LIBY?=		${DESTDIR}${LIBDIR_BASE}/liby.a
+LIBYPCLNT?=	${DESTDIR}${LIBDIR_BASE}/libypclnt.a
+LIBZ?=		${DESTDIR}${LIBDIR_BASE}/libz.a
+LIBZFS?=	${DESTDIR}${LIBDIR_BASE}/libzfs.a
+LIBZFS_CORE?=	${DESTDIR}${LIBDIR_BASE}/libzfs_core.a
+LIBZPOOL?=	${DESTDIR}${LIBDIR_BASE}/libzpool.a
 
 # enforce the 2 -lpthread and -lc to always be the last in that exact order
 .if defined(LDADD)
@@ -183,7 +183,7 @@ LDADD:=	${LDADD:N-lc} -lc
 .if defined(_LIBRARIES) && defined(LIB) && \
     ${_LIBRARIES:M${LIB}} != ""
 .if !defined(LIB${LIB:tu})
-.error ${.CURDIR}: Missing value for LIB${LIB:tu} in ${_this:T}.  Likely should be: LIB${LIB:tu}?= $${DESTDIR}$${LIBDIR}/lib${LIB}.a
+.error ${.CURDIR}: Missing value for LIB${LIB:tu} in ${_this:T}.  Likely should be: LIB${LIB:tu}?= $${DESTDIR}$${LIBDIR_BASE}/lib${LIB}.a
 .endif
 .endif
 

Modified: stable/11/share/mk/bsd.own.mk
==============================================================================
--- stable/11/share/mk/bsd.own.mk	Fri Jun 23 19:04:40 2017	(r320293)
+++ stable/11/share/mk/bsd.own.mk	Fri Jun 23 19:44:20 2017	(r320294)
@@ -152,7 +152,13 @@ DTBOWN?=	root
 DTBGRP?=	wheel
 DTBMODE?=	444
 
-LIBDIR?=	/usr/lib
+# Use make.conf / environment LIBDIR as default if set...
+.if !empty(_PREMK_LIBDIR)
+LIBDIR_BASE?=	${_PREMK_LIBDIR}
+.endif
+# otherwise use our expected default value.
+LIBDIR_BASE?=	/usr/lib
+LIBDIR?=	${LIBDIR_BASE}
 LIBCOMPATDIR?=	/usr/lib/compat
 LIBDATADIR?=	/usr/libdata
 LIBEXECDIR?=	/usr/libexec

Modified: stable/11/share/mk/local.sys.mk
==============================================================================
--- stable/11/share/mk/local.sys.mk	Fri Jun 23 19:04:40 2017	(r320293)
+++ stable/11/share/mk/local.sys.mk	Fri Jun 23 19:44:20 2017	(r320294)
@@ -39,6 +39,10 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH
 OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
 .endif
 
+.if !empty(LIBDIR)
+_PREMK_LIBDIR:=	${LIBDIR}
+.endif
+
 .include "src.sys.mk"
 
 .if ${.MAKE.MODE:Mmeta*} != ""

Modified: stable/11/share/mk/src.libnames.mk
==============================================================================
--- stable/11/share/mk/src.libnames.mk	Fri Jun 23 19:04:40 2017	(r320293)
+++ stable/11/share/mk/src.libnames.mk	Fri Jun 23 19:44:20 2017	(r320294)
@@ -339,13 +339,13 @@ _DP_rdmacm=	ibverbs
 
 # Define special cases
 LDADD_supcplusplus=	-lsupc++
-LIBATF_C=	${DESTDIR}${LIBDIR}/libprivateatf-c.a
-LIBATF_CXX=	${DESTDIR}${LIBDIR}/libprivateatf-c++.a
+LIBATF_C=	${DESTDIR}${LIBDIR_BASE}/libprivateatf-c.a
+LIBATF_CXX=	${DESTDIR}${LIBDIR_BASE}/libprivateatf-c++.a
 LDADD_atf_c=	-lprivateatf-c
 LDADD_atf_cxx=	-lprivateatf-c++
 
 .for _l in ${_PRIVATELIBS}
-LIB${_l:tu}?=	${DESTDIR}${LIBDIR}/libprivate${_l}.a
+LIB${_l:tu}?=	${DESTDIR}${LIBDIR_BASE}/libprivate${_l}.a
 .endfor
 
 .for _l in ${_LIBRARIES}
@@ -416,7 +416,7 @@ LIBSMDBDIR=	${OBJTOP}/lib/libsmdb
 LIBSMDB?=	${LIBSMDBDIR}/libsmdb.a
 
 LIBSMUTILDIR=	${OBJTOP}/lib/libsmutil
-LIBSMUTIL?=	${LIBSMDBDIR}/libsmutil.a
+LIBSMUTIL?=	${LIBSMUTILDIR}/libsmutil.a
 
 LIBNETBSDDIR?=	${OBJTOP}/lib/libnetbsd
 LIBNETBSD?=	${LIBNETBSDDIR}/libnetbsd.a
@@ -449,16 +449,16 @@ LIBPARSEDIR=	${OBJTOP}/usr.sbin/ntp/libparse
 LIBPARSE?=	${LIBPARSEDIR}/libparse.a
 
 LIBLPRDIR=	${OBJTOP}/usr.sbin/lpr/common_source
-LIBLPR?=	${LIBOPTSDIR}/liblpr.a
+LIBLPR?=	${LIBLPRDIR}/liblpr.a
 
 LIBFIFOLOGDIR=	${OBJTOP}/usr.sbin/fifolog/lib
-LIBFIFOLOG?=	${LIBOPTSDIR}/libfifolog.a
+LIBFIFOLOG?=	${LIBFIFOLOGDIR}/libfifolog.a
 
 LIBBSNMPTOOLSDIR=	${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
 LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools.a
 
 LIBAMUDIR=	${OBJTOP}/usr.sbin/amd/libamu
-LIBAMU?=	${LIBAMUDIR}/libamu/libamu.a
+LIBAMU?=	${LIBAMUDIR}/libamu.a
 
 # Define a directory for each library.  This is useful for adding -L in when
 # not using a --sysroot or for meta mode bootstrapping when there is no