Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v retrieving revision 1.289 retrieving revision 1.289.2.1 diff -u -p -r1.289 -r1.289.2.1 --- src/share/mk/bsd.lib.mk 2008/10/19 22:05:21 1.289 +++ src/share/mk/bsd.lib.mk 2008/12/01 00:36:29 1.289.2.1 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.289 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: bsd.lib.mk,v 1.289.2.1 2008/12/01 00:36:29 snj Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -24,7 +24,12 @@ MKSTATICLIB:= no .if ${LIBISPRIVATE} != "no" MKDEBUGLIB:= no MKLINT:= no +MKPICINSTALL:= no +. if defined(NOSTATICLIB) && ${MKPICLIB} != "no" +MKSTATICLIB:= no +. else MKPIC:= no +. endif MKPROFILE:= no .endif @@ -367,7 +372,7 @@ LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.l .if ${LIBISPRIVATE} != "no" # No installation is required libinstall:: -.else # ${LIBISPRIVATE} == "no" # { +.endif # ${LIBISPRIVATE} == "no" # { .if ${MKDEBUGLIB} != "no" _LIBS+=lib${LIB}_g.a @@ -406,8 +411,6 @@ _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION} _LIBS+=llib-l${LIB}.ln .endif -.endif # ${LIBISPRIVATE} == "no" # } - ALLOBJS= .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \ || ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"