svn commit: r289408 - head/share/mk

[Bryan Drewery]

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