From 34673ebfc37763889cbbdea9a6682a0ec1a559e1 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Sun, 7 Sep 2003 14:15:40 +0000
Subject: - No need to create libfoo.so -> libfoo.so.X symlinks in /lib,   as
 it was decided that our toolchain will revert to looking   for libraries in
 /usr/lib only.

- Make /usr/lib/libfoo.so -> /lib/libfoo.so.X symlinks absolute
  so that they still work if /usr is symlinked.

- Remove stale /usr/lib/libfoo.so.X libraries during install.

Discussed with:	gordon, obrien, peter
---
 share/mk/bsd.lib.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'share/mk/bsd.lib.mk')

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 58bce19..a13df73 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -208,10 +208,15 @@ _libinstall:
 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
 .if defined(SHLIB_LINK)
-	ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
-.if (${LIBDIR} != ${SHLIBDIR})
-	ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \
+.if ${SHLIBDIR} == ${LIBDIR}
+	ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.else
+	ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
 	    ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME})
+	-chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
+	rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
+.endif
 .endif
 .endif
 .endif
-- 
cgit v1.1