From a89bd62015d59bd8b292041c96e0a411e628596f Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 10 Jun 2003 04:47:49 +0000
Subject: [PATCH] Remove NOSHLIBS, users can get by with NOPIC.

Desired by:	ru
---
 share/mk/bsd.lib.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 44e51ec1514e..c3eabb3eb04e 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -175,7 +175,6 @@ lib${LIB}_p.a: ${POBJS}
 	${RANLIB} ${.TARGET}
 .endif
 
-.if !defined(NOSHLIBS)
 .if defined(SHLIB_NAME) || \
     defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
 SOBJS+=		${OBJS:.o=.So}
@@ -183,7 +182,6 @@ SOBJS+=		${OBJS:.o=.So}
 
 .if defined(SHLIB_NAME)
 _LIBS+=		${SHLIB_NAME}
-.endif
 
 ${SHLIB_NAME}: ${SOBJS}
 	@${ECHO} building shared library ${SHLIB_NAME}
@@ -263,7 +261,7 @@ _libinstall:
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
 .endif
-.if !defined(NOSHLIBS) && defined(SHLIB_NAME)
+.if defined(SHLIB_NAME)
 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}