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.269
retrieving revision 1.271
diff -u -p -r1.269 -r1.271
--- src/share/mk/bsd.lib.mk	2006/09/18 05:15:35	1.269
+++ src/share/mk/bsd.lib.mk	2007/03/18 09:08:45	1.271
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.269 2006/09/18 05:15:35 dbj Exp $
+#	$NetBSD: bsd.lib.mk,v 1.271 2007/03/18 09:08:45 tsutsui Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -112,7 +112,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 # SHLIB_LDSTARTFILE:	support .o file, call C++ file-level constructors
 # SHLIB_LDENDFILE:	support .o file, call C++ file-level destructors
 # FPICFLAGS:		flags for ${FC} to compile .[fF] files to .so objects.
-# CPPICFLAGS:		flags for ${CPP} to preprocess .[sS] files for ${AS}
+# CPPPICFLAGS:		flags for ${CPP} to preprocess .[sS] files for ${AS}
 # CPICFLAGS:		flags for ${CC} to compile .[cC] files to pic objects.
 # CSHLIBFLAGS:		flags for ${CC} to compile .[cC] files to .so objects.
 #			(usually includes ${CPICFLAGS})
@@ -187,14 +187,14 @@ FFLAGS+=	${FOPTS}
 .c.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(COPTS) || empty(COPTS:M*-g*)
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 	${OBJCOPY} -x ${.TARGET}
 .endif
 
 .c.po:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if !defined(COPTS) || empty(COPTS:M*-g*)
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 	${OBJCOPY} -X ${.TARGET}
 .endif
 
@@ -205,21 +205,21 @@ FFLAGS+=	${FOPTS}
 .c.so:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(COPTS) || empty(COPTS:M*-g*)
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 	${OBJCOPY} -x ${.TARGET}
 .endif
 
 .cc.o .cpp.o .cxx.o .C.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(COPTS) || empty(COPTS:M*-g*)
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 	${OBJCOPY} -x ${.TARGET}
 .endif
 
 .cc.po .cpp.po .cxx.po .C.po:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if !defined(COPTS) || empty(COPTS:M*-g*)
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 	${OBJCOPY} -X ${.TARGET}
 .endif
 
@@ -230,7 +230,7 @@ FFLAGS+=	${FOPTS}
 .cc.so .cpp.so .cxx.so .C.so:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(COPTS) || empty(COPTS:M*-g*)
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 	${OBJCOPY} -x ${.TARGET}
 .endif