[src/trunk]: src/share/mk Also set SHLIBDIR to /lib if ${USE_SHLIBDIR} != "no".

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5673a8b4065c
branches:  trunk
changeset: 574787:5673a8b4065c
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Mar 12 13:21:12 2005 +0000

description:
Also set SHLIBDIR to /lib if ${USE_SHLIBDIR} != "no".

This allows <bsd.lib.mk> to correctly set the RPATH of libraries that
use USE_SHLIBDIR=yes to /lib, so that dependent libraries can be found
from /lib when /usr/lib isn't mounted yet.
This was the intention of the _LIBLDOPTS support in <bsd.lib.mk>.

Fixes problem reported by Dan Carosone with when /sbin/cgdconfig is
dynamically linked against libcrypto.so but not libcrypt.so (it was
relying upon libcrypto.so to pull in libcrypt.so).

diffstat:

 share/mk/bsd.shlib.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r dd3e5b460b9e -r 5673a8b4065c share/mk/bsd.shlib.mk
--- a/share/mk/bsd.shlib.mk     Sat Mar 12 10:35:29 2005 +0000
+++ b/share/mk/bsd.shlib.mk     Sat Mar 12 13:21:12 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.shlib.mk,v 1.3 2004/01/02 16:12:36 lukem Exp $
+#      $NetBSD: bsd.shlib.mk,v 1.4 2005/03/12 13:21:12 lukem Exp $
 
 .if !defined(_BSD_SHLIB_MK_)
 _BSD_SHLIB_MK_=1
@@ -10,7 +10,8 @@
 .endif
 
 .if ${MKDYNAMICROOT} == "no" || \
-    (${BINDIR:Ux} != "/bin" && ${BINDIR:Ux} != "/sbin")
+    (${BINDIR:Ux} != "/bin" && ${BINDIR:Ux} != "/sbin" && \
+     ${USE_SHLIBDIR:Uno} == "no")
 SHLIBDIR?=     /usr/lib
 .else
 SHLIBDIR?=     /lib