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
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.286
retrieving revision 1.290
diff -u -p -r1.286 -r1.290
--- src/share/mk/bsd.lib.mk	2008/09/09 11:54:19	1.286
+++ src/share/mk/bsd.lib.mk	2008/11/24 02:01:46	1.290
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.286 2008/09/09 11:54:19 joerg Exp $
+#	$NetBSD: bsd.lib.mk,v 1.290 2008/11/24 02:01:46 cube Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -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
 
@@ -34,6 +39,13 @@ realinstall:	checkver libinstall
 clean:		cleanlib
 
 ##### LIB specific flags.
+# XXX: This is needed for programs that link with .a libraries
+# Perhaps a more correct solution is to always generate _pic.a
+# files or always have a shared library.
+.if defined(MKPIE) && (${MKPIE} != "no")
+CFLAGS+=        ${PIE_CFLAGS}
+AFLAGS+=        ${PIE_AFLAGS}
+.endif
 COPTS+=     ${COPTS.lib${LIB}}
 CPPFLAGS+=  ${CPPFLAGS.lib${LIB}}
 CXXFLAGS+=  ${CXXFLAGS.lib${LIB}}
@@ -69,6 +81,7 @@ SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ;
 	exists(${NETBSDSRCDIR}/lib/checkver)
 checkver:
 	@(cd ${.CURDIR} && \
+	    HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
 	    ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
 		    -d ${DESTDIR}${_LIBSODIR} ${LIB})
 .endif
@@ -359,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
@@ -398,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"