summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorgordon <gordon@FreeBSD.org>2003-08-17 23:56:29 +0000
committergordon <gordon@FreeBSD.org>2003-08-17 23:56:29 +0000
commit61c5e684ccd4d6337723b0cc554f6cb7b829bc0f (patch)
tree56ed4287fbb7be347425bb622067a155e1a93c92 /share/mk
parentcdcca2ab04b0d94fd9454304ffb1ef3c66c0bbcd (diff)
downloadFreeBSD-src-61c5e684ccd4d6337723b0cc554f6cb7b829bc0f.zip
FreeBSD-src-61c5e684ccd4d6337723b0cc554f6cb7b829bc0f.tar.gz
When creating .so symlinks, use SHLIBDIR instead of LIBDIR so symlinks
are created in the correct location. Always make them. For libraries that live in /lib, this causes a /lib/libfoo.so and a compatibility /usr/lib/libfoo.so to be created. We may want to drop the /usr/lib/libfoo.so symlink at some future point.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.lib.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 19cbbe1..4ad7831 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -206,9 +206,8 @@ _libinstall:
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
.if defined(SHLIB_LINK)
-.if (${LIBDIR} == ${SHLIBDIR})
- ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
-.else
+ ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
+.if (${LIBDIR} != ${SHLIBDIR})
ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.endif
OpenPOWER on IntegriCloud