Thu Jun 17 03:27:06 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>

2 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 91fe268b..dc34b6b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
+Thu Jun 17 03:27:06 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * config/wix.mpb:
+        
+          Moved the quote tags to a different location.
+
 Mon Jun 14 23:52:33 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * templates/wix.mpd:
-        
-          Bug fix where invalid Id is generated if the binary's 
+
+          Bug fix where invalid Id is generated if the binary's
           name contained a dash.
-          
+
           Added support for installing GME decorators.
 
 Mon Jun 14 22:06:56 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
diff --git a/config/wix.mpb b/config/wix.mpb
index 8e29df87..fd766993 100644
--- a/config/wix.mpb
+++ b/config/wix.mpb
@@ -4,7 +4,7 @@ project {
   custom_only = 1
 
   Define_Custom (WXS) {
-    command           = <%quote%>$(WIX_ROOT)/bin/candle.exe<%quote%>
+    command           = <%quote%>$(WIX_ROOT)<%quote%>/bin/candle.exe
     inputext          = .wxs
     output_option     = -out
     commandflags      = -nologo
@@ -17,10 +17,10 @@ project {
   }
 
   postbuild = \
-    <%quote%>$(WIX_ROOT)/bin/light.exe<%quote%> -out <%project_name%>.msi \
+    <%quote%>$(WIX_ROOT)<%quote%>/bin/light.exe -out <%project_name%>.msi \
     <%light_flags%> <%foreach(wxs_files)%><%noextension(wxs_file)%>.wixobj <%endfor%>
 
-  specific(vc7, vc71, vc8, vc9, vc10) {
+  specific(prop:microsoft) {
     wix_flags += -dtype=<%prj_type%>
   }
 }