From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Fri, 15 Jun 2007 22:36:52 +0000 (+0000)
Subject: [WinOF] WIX - use WIX_Tools\ folder for download & exec.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=13a767ebb56e3ec1b0b03bde90e80002e26ee696;p=~shefty%2Frdma-win.git

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