From: stansmith Date: Fri, 15 Jun 2007 22:35:00 +0000 (+0000) Subject: [WinOF] WIX - use WIX_tools\ folder. X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=03e0c1a41849cd44f7d92f089c09c6efa3492ef2;p=~shefty%2Frdma-win.git [WinOF] WIX - use WIX_tools\ folder. git-svn-id: svn://openib.tc.cornell.edu/gen1@705 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/branches/WinOF/WIX/x86/Makefile b/branches/WinOF/WIX/x86/Makefile index 30dc080c..9fa9ab7e 100644 --- a/branches/WinOF/WIX/x86/Makefile +++ b/branches/WinOF/WIX/x86/Makefile @@ -3,7 +3,7 @@ # S=WOF P=$(S)_x86 -L=D:\Installers\WIX\download\wix-2.0.5325.0-binaries +L=..\WIX_tools\wix-2.0.5325.0-binaries WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl" full: clean $(P).msi @@ -17,7 +17,7 @@ MySetup: $(P).msi $(S).wixobj: $(S).wxs $(P).msi: $(S).wixobj - light.exe /nologl -out $(P).msi $(S).wixobj $(WIX_UI) + $(L)\light.exe /nologl -out $(P).msi $(S).wixobj $(WIX_UI) dir $(P).msi regchg.obj: regchg.c @@ -32,5 +32,5 @@ regchg.exe: regchg.obj .SUFFIXES: .wxs .wixobj .wxs.wixobj:: - candle.exe /nologo $< + $(L)\candle.exe /nologo $<