Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v retrieving revision 1.313 retrieving revision 1.314 diff -u -p -r1.313 -r1.314 --- src/share/mk/bsd.lib.mk 2011/04/10 16:52:36 1.313 +++ src/share/mk/bsd.lib.mk 2011/04/11 23:03:38 1.314 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.313 2011/04/10 16:52:36 joerg Exp $ +# $NetBSD: bsd.lib.mk,v 1.314 2011/04/11 23:03:38 joerg Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -511,11 +511,10 @@ lib${LIB}_g.a:: ${GOBJS} __archivebuild _LIBLDOPTS= .if ${SHLIBDIR} != "/usr/lib" -_LIBLDOPTS+= -Wl,-rpath-link,=${SHLIBDIR} \ - -Wl,-rpath,=${SHLIBDIR} \ +_LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \ -L=${SHLIBDIR} .elif ${SHLIBINSTALLDIR} != "/usr/lib" -_LIBLDOPTS+= -Wl,-rpath-link,=${SHLIBINSTALLDIR} \ +_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \ -L=${SHLIBINSTALLDIR} .endif