From owner-svn-src-head@freebsd.org  Fri Oct 16 05:06:44 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 AC433A16DBB;
 Fri, 16 Oct 2015 05:06:44 +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 7A0F5C0;
 Fri, 16 Oct 2015 05:06:44 +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 t9G56hro083984;
 Fri, 16 Oct 2015 05:06:43 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9G56h14083983;
 Fri, 16 Oct 2015 05:06:43 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201510160506.t9G56h14083983@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, 16 Oct 2015 05:06:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289408 - 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, 16 Oct 2015 05:06:44 -0000

Author: bdrewery
Date: Fri Oct 16 05:06:43 2015
New Revision: 289408
URL: https://svnweb.freebsd.org/changeset/base/289408

Log:
  Similar to r289355, /usr/tests is within the base system so put the symbols
  into /usr/lib/debug.
  
  This covers some missing files:
    /usr/tests/libexec/rtld-elf/.debug
    /usr/tests/libexec/rtld-elf/.debug/libpythagoras.so.0.debug
    /usr/tests/lib/libc/tls/.debug
    /usr/tests/lib/libc/tls/.debug/libh_tls_dynamic.so.1.debug
    /usr/tests/lib/libc/tls/.debug/h_tls_dlopen.so.debug
    /usr/tests/lib/libthr/dlopen/.debug
    /usr/tests/lib/libthr/dlopen/.debug/h_pthread_dlopen.so.1.debug
    /usr/tests/lib/libxo/.debug
    /usr/tests/lib/libxo/.debug/libenc_test.so.debug
  
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Fri Oct 16 04:07:27 2015	(r289407)
+++ head/share/mk/bsd.lib.mk	Fri Oct 16 05:06:43 2015	(r289408)
@@ -140,7 +140,7 @@ SHLIB_NAME_FULL=${SHLIB_NAME}.full
 # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
 .if ${_SHLIBDIR} == "/boot" ||\
     ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\
-    ${SHLIBDIR:C%/usr/lib(32)?(/.*)?%/usr/lib%} == "/usr/lib"
+    ${SHLIBDIR:C%/usr/(tests/)?lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib"
 DEBUGFILEDIR=${DEBUGDIR}${_SHLIBDIR}
 .else
 DEBUGFILEDIR=${_SHLIBDIR}/.debug