From 2c6c05c72f85ae62f15c98cbfc9e0ad7a2e19a84 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 12 May 2002 13:48:53 +0000 Subject: Back out rev 1.118. --- share/mk/bsd.lib.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index add06aa..4272ec8 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -151,18 +151,11 @@ STRIP?= -s @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} -.if defined(INTERNALLIB) || defined(NOLIB) -NOPROFILE= 1 -NOPIC= 1 -NOINSTALLLIB= 1 -NOMAN= 1 -.endif - -.if !defined(NOLIB) -.if defined(NOPROFILE) -_LIBS=lib${LIB}.a -.else +.if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB) +.if !defined(NOPROFILE) && !defined(INTERNALLIB) _LIBS=lib${LIB}.a lib${LIB}_p.a +.else +_LIBS=lib${LIB}.a .endif .endif @@ -307,7 +300,7 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} realinstall: beforeinstall realinstall: _libinstall _libinstall: -.if !defined(INTERNALLIB) && !defined(NOLIB) +.if !defined(INTERNALLIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .if !defined(NOPROFILE) -- cgit v1.1