From 61eedb351a2e5344e45f40020ad77181b420fd0f Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Tue, 2 Dec 2008 11:38:23 +0000
Subject: [PATCH] KDBG needs DBG to be set, I can't imagine any useful
 situation for KDBG without DBG. Change the <if> logic in
 ReactOS-general.rbuild (and ReactOS-arm.rbuild for the ARM guys) accordingly.
 This also supersedes DBG_OR_KDBG, which never worked properly for Release
 builds anyway.

Should fix the Release build without touching rbuild itself :-)

svn path=/trunk/; revision=37808
---
 reactos/ReactOS-arm.rbuild               | 9 ++++-----
 reactos/ReactOS-generic.rbuild           | 9 ++++-----
 reactos/config.template.rbuild           | 2 +-
 reactos/ntoskrnl/ntoskrnl-generic.rbuild | 2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild
index 20207320f1f..1e65387c5ae 100644
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
@@ -17,11 +17,10 @@
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<property name="DBG_OR_KDBG" value="true" />
+		
+		<if property="KDBG" value="1">
+			<define name="KDBG">1</define>
+		</if>
 	</if>
 	
 	<include>.</include>
diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index ec0ef2f04d3..a850eaf9d37 100644
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -9,11 +9,10 @@
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<property name="DBG_OR_KDBG" value="true" />
+		
+		<if property="KDBG" value="1">
+			<define name="KDBG">1</define>
+		</if>
 	</if>
 
 	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index b751cf9c910..b781959f075 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -43,7 +43,7 @@
 
 
 <!--
-	Whether to compile in the integrated kernel debugger.
+	Whether to compile in the integrated kernel debugger. Requires DBG to be set.
 -->
 <property name="KDBG" value="1" />
 
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index 2f29554d611..6c7626b2431 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -302,7 +302,7 @@
 				<file>kdb_keyboard.c</file>
 				<file>kdb_serial.c</file>
 			</if>
-			<if property="DBG_OR_KDBG" value="true">
+			<if property="DBG" value="1">
 				<file>kdb_symbols.c</file>
 			</if>
 		</directory>