[src/netbsd-1-6]: src/sys/conf Pullup revisions 1.24-1.25 (requested by ttaka...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/63cfaf533cf5
branches:  netbsd-1-6
changeset: 529920:63cfaf533cf5
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sun Jan 26 09:44:01 2003 +0000

description:
Pullup revisions 1.24-1.25 (requested by ttaka in ticket #1082)
 Back out revision 1.23, it breaks all kernel configs that do
 makeoptions     COPTS="foo"

diffstat:

 sys/conf/Makefile.kern.inc |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 419f01d8735c -r 63cfaf533cf5 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Sun Jan 26 09:40:35 2003 +0000
+++ b/sys/conf/Makefile.kern.inc        Sun Jan 26 09:44:01 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.13.4.8 2002/12/01 22:26:32 he Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.13.4.9 2003/01/26 09:44:01 jmc Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. There are
@@ -47,7 +47,7 @@
 INCLUDES?=     -I. ${EXTRA_INCLUDES} -I$S/arch -I$S -nostdinc
 CPPFLAGS+=     ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT
 DEFCOPTS?=     -O2
-COPTS+=                ${DEFCOPTS}
+COPTS?=                ${DEFCOPTS}
 DBG=           # might contain unwanted -Ofoo
 DEFWARNINGS?=  yes
 .if (${DEFWARNINGS} == "yes")