[src/trunk]: src/share/mk Check ${SHLIBDIR} against "/usr/lib" instead of ${L...

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

details:   https://anonhg.NetBSD.org/src/rev/77c54818ce9f
branches:  trunk
changeset: 551977:77c54818ce9f
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Sep 14 22:36:55 2003 +0000

description:
Check ${SHLIBDIR} against "/usr/lib" instead of ${LIBDIR} when determining
if we need to add stuff (usually "/lib") to the rpath-link path before
"/usr/lib".  Otherwise, this barfs if LIBDIR != /usr/lib or /lib, and
we're cross-building (e.g., in src/x11)

diffstat:

 share/mk/bsd.prog.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r fb46967659b3 -r 77c54818ce9f share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sun Sep 14 22:33:31 2003 +0000
+++ b/share/mk/bsd.prog.mk      Sun Sep 14 22:36:55 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.186 2003/09/13 03:44:21 erh Exp $
+#      $NetBSD: bsd.prog.mk,v 1.187 2003/09/14 22:36:55 lukem Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -138,11 +138,11 @@
 LIBCRT0=       ${DESTDIR}/lib/crt0.o
 .endif
 .endif
-.if ${SHLIBDIR} != ${LIBDIR}
+.if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=  -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
                -R${SHLIBDIR} \
                -L${DESTDIR}${SHLIBDIR}
-.elif ${SHLIBINSTALLDIR} != ${LIBDIR}
+.elif ${SHLIBINSTALLDIR} != "/usr/lib"
 _PROGLDOPTS+=  -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
                -L${DESTDIR}${SHLIBINSTALLDIR}
 .endif