libpthread - Always override the symlinks
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 6 May 2011 08:24:28 +0000 (01:24 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 6 May 2011 08:24:28 +0000 (01:24 -0700)
* Always override the symlinks for /usr/lib/libpthread* to ensure that
  very old systems are properly upgraded.

* If the user wants to point the symlink at a different threading library
  the use rcan set THREAD_LIB in /etc/make.conf.

Reported-by: Vitaly Shevtsov <loki.vt@gmail.com>
lib/libpthread/Makefile

index 9a925d3..e2df584 100644 (file)
@@ -133,14 +133,11 @@ MLINKS+= \
 
 realinstall: linkinstall
 linkinstall:
-       # Do not overwrite existing symlinks
-       if [ ! -e ${DESTDIR}${TARGET_SHLIBDIR}/${SONAME} ]; then \
-               ${LN} -fs thread/lib${THREAD_LIB}.so \
-                       ${DESTDIR}${TARGET_SHLIBDIR}/${SONAME}; \
-       fi
-       if [ ! -e ${DESTDIR}${TARGET_LIBDIR}/${LIBNAME}.a ]; then \
-               ${LN} -fs thread/lib${THREAD_LIB}.a \
-                       ${DESTDIR}${TARGET_LIBDIR}/${LIBNAME}.a; \
-       fi
+       # Always overwrite existing symlinks.  If the user wants the
+       # library to point elsewhere he can set THREAD_LIB in /etc/make.conf.
+       ${LN} -fs thread/lib${THREAD_LIB}.so \
+               ${DESTDIR}${TARGET_SHLIBDIR}/${SONAME}; \
+       ${LN} -fs thread/lib${THREAD_LIB}.a \
+               ${DESTDIR}${TARGET_LIBDIR}/${LIBNAME}.a; \
 
 .include <bsd.lib.mk>