From 817b59bff6dd31aad675ef8aac470a4a5153d359 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 13 Feb 2004 10:40:54 +0000
Subject: [PATCH] Reduce the number of knobs controlling the build of debug
 modules to one, DEBUG_FLAGS, which is also compatible with <bsd.prog.mk>.
 Previously one had to set both DEBUG and DEBUG_FLAGS to build the .ko.debug
 with debugging symbols which was boring when doing this manually.

---
 sys/conf/kern.pre.mk |  2 +-
 sys/conf/kmod.mk     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 0b2b62413fcb..daa64bd04514 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -98,5 +98,5 @@ MKMODULESENV+=	ALL_MODULES=LINT
 MKMODULESENV+=	MODULES_OVERRIDE="${MODULES_OVERRIDE}"
 .endif
 .if defined(DEBUG)
-MKMODULESENV+=	DEBUG="${DEBUG}" DEBUG_FLAGS="${DEBUG}"
+MKMODULESENV+=	DEBUG_FLAGS="${DEBUG}"
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index d6de8718a0b1..41381373e817 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -117,7 +117,7 @@ OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 PROG=	${KMOD}.ko
 .endif
 
-.if !defined(DEBUG)
+.if !defined(DEBUG_FLAGS)
 FULLPROG=	${PROG}
 .else
 FULLPROG=	${PROG}.debug
@@ -127,8 +127,8 @@ ${PROG}: ${FULLPROG}
 
 ${FULLPROG}: ${KMOD}.kld
 	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-.if !defined(DEBUG)
-	${OBJCOPY} --strip-debug ${FULLPROG}
+.if !defined(DEBUG_FLAGS)
+	${OBJCOPY} --strip-debug ${.TARGET}
 .endif
 
 EXPORT_SYMS?=	NO
@@ -191,7 +191,7 @@ ${_ILINKS}:
 
 CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} symb.tmp tmp.o
 
-.if defined(DEBUG)
+.if defined(DEBUG_FLAGS)
 CLEANFILES+= ${FULLPROG}
 .endif
 
@@ -202,7 +202,7 @@ _INSTALLFLAGS:=	${INSTALLFLAGS}
 _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
 .endfor
 
-.if defined(DEBUG)
+.if defined(DEBUG_FLAGS)
 install.debug:
 	cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install
 .endif
@@ -210,12 +210,11 @@ install.debug:
 .if !target(realinstall)
 realinstall: _kmodinstall
 .ORDER: beforeinstall _kmodinstall
-.if defined(DEBUG) && defined(INSTALL_DEBUG)
 _kmodinstall:
+.if defined(DEBUG_FLAGS) && defined(INSTALL_DEBUG)
 	${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
 	    ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}
 .else
-_kmodinstall:
 	${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}