[WinOF] WIX - use WIX_Tools\ folder for download & exec.

git-svn-id: svn://openib.tc.cornell.edu/gen1@707 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WinOF/WIX/x64/Makefile b/branches/WinOF/WIX/x64/Makefile
index b6c8b747185b80ebd4a4ce6c0bcdcdb6731f73ff..b838f5b6249f7eae8c106490d4c48295eef5e474 100644 (file)
--- a/branches/WinOF/WIX/x64/Makefile
+++ b/branches/WinOF/WIX/x64/Makefile
@@ -3,21 +3,26 @@
 #\r
 S=WOF\r
 P=$(S)_x64\r
-L=D:\Installers\WIX\download\wix-2.0.5325.0-binaries\r
+\r
+#WIX 2.0\r
+L=..\WIX_tools\wix-2.0.5325.0-binaries\r
+\r
+# WIX 3.0 L=..\WIX_tools\wix-3.0.2925.0-binaries\r
+\r
 WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl"\r
 \r
 full: clean $(P).msi\r
 \r
 clean:\r
-  -del /q $(S).wixobj 2>nul\r
-  -del /q $(P).msi 2>nul\r
+  @del /q $(S).wixobj 2>nul\r
+  @del /q $(P).msi 2>nul\r
 \r
 MySetup: $(P).msi\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj\r
-       light.exe /nologl -out $(P).msi $(S).wixobj $(WIX_UI)\r
+       $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        dir $(P).msi\r
 \r
 \r
@@ -27,5 +32,5 @@ $(P).msi: $(S).wixobj
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  candle.exe /nologo $<\r
+  $(L)\candle.exe /nologo $<\r
 \r