From 331da155dfce2db0e3084461530064feb13ca812 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Tue, 10 Aug 2010 22:48:55 +0200
Subject: [PATCH] Correct debug path and Ice version in installer

---
 installer/Settings.wxi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/installer/Settings.wxi b/installer/Settings.wxi
index 57889926b..d8520942e 100644
--- a/installer/Settings.wxi
+++ b/installer/Settings.wxi
@@ -19,7 +19,6 @@
 
   <?define OpenSslDir = "\dev\openssl" ?>
   <?define DebugToolsDir = "\Program Files (x86)\Debugging Tools for Windows (x86)" ?>
-  <?define DebugToolsDir = "C:\Windows\System32" ?>
   <?define MergeModuleDir = "C:\Program Files (x86)\Common Files\Merge Modules" ?>
   <?define ZlibDir = "\dev\zlib" ?>
 
@@ -29,7 +28,7 @@
   <?define DBusDir = "\dev\dbus" ?>
   -->
 
-  <?ifdef RedistDirVC10 ?>
+  <?ifdef MergeModuleDir ?>
   <?define IceDir = "\dev\Ice\bin\vc100" ?>
   <?else ?>
   <?define IceDir = "\dev\Ice\bin" ?>