From 61c5e684ccd4d6337723b0cc554f6cb7b829bc0f Mon Sep 17 00:00:00 2001 From: gordon Date: Sun, 17 Aug 2003 23:56:29 +0000 Subject: 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. --- share/mk/bsd.lib.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'share/mk') 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 -- cgit v1.1