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.322 retrieving revision 1.323 diff -u -p -r1.322 -r1.323 --- src/share/mk/bsd.lib.mk 2012/07/19 19:42:45 1.322 +++ src/share/mk/bsd.lib.mk 2012/08/23 15:45:03 1.323 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.322 2012/07/19 19:42:45 christos Exp $ +# $NetBSD: bsd.lib.mk,v 1.323 2012/08/23 15:45:03 joerg Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -540,11 +540,7 @@ lib${LIB}_g.a:: ${GOBJS} __archivebuild _LIBLDOPTS= .if ${SHLIBDIR} != "/usr/lib" -_LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \ - -L=${SHLIBDIR} -.elif ${SHLIBINSTALLDIR} != "/usr/lib" -_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \ - -L=${SHLIBINSTALLDIR} +_LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} -L=${SHLIBDIR} .endif # gcc -shared now adds -lc automatically. For libraries other than libc and