[vlc-devel] [PATCH v2 07/10] win32: msi: simplify the pseudo-path to call WIX

[Steve Lhomme]

Set the /v directly in WINE_C
Use W_WINE_C for the windows variant passed to WIX
---
 extras/package/win32/msi.mak | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index aa8f41f4b97b..b5aed91d894a 100644
--- a/extras/package/win32/msi.mak
+++ b/extras/package/win32/msi.mak
@@ -17,7 +17,8 @@ MSIOUTFILE=vlc-$(VERSION)-win64.msi
 else
 MSIOUTFILE=vlc-$(VERSION)-win32.msi
 endif
-WINE_C=`$(HOST_TO_BUILD_CMD) c:`
+WINE_C=`$(HOST_TO_BUILD_CMD) c:/v`
+W_WINDOWS_C=`$(PATH_TO_HOST_CMD) $(WINE_C)`
 
 heat: package-win-strip
 	$(HEAT) dir "$(W_VLCDIR)/plugins" -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out "$(W_MSIBUILDDIR)\Plugins.fragment.wxs"
@@ -33,9 +34,9 @@ candle: heat
 	$(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension "$(W_MSIDIR)\product.wxs" "$(W_MSIDIR)\extensions.wxs" "$(W_MSIBUILDDIR)\*.fragment.wxs"
 
 light: candle
-	test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v"
-	ln -Tsf "$(abs_top_builddir)/vlc-$(VERSION)" "$(WINE_C)"/v
-	$(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b "$(W_MSIDIR)" -b C:/v/plugins -b C:/v/locale -b C:/v/lua -b C:/v/skins "$(W_MSIBUILDDIR)\\product.wixobj" "$(W_MSIBUILDDIR)\\axvlc.wixobj" "$(W_MSIBUILDDIR)\\extensions.wixobj" "$(W_MSIBUILDDIR)\\*.fragment.wixobj" -o $(MSIOUTFILE)
+	test ! -d "$(WINE_C)" -o ! -f "$(WINE_C)"
+	ln -Tsf "$(abs_top_builddir)/vlc-$(VERSION)" "$(WINE_C)"
+	$(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b "$(W_MSIDIR)" -b "$(W_WINDOWS_C)\plugins" -b "$(W_WINDOWS_C)\locale" -b "$(W_WINDOWS_C)\lua" -b "$(W_WINDOWS_C)\skins" "$(W_MSIBUILDDIR)\product.wixobj" "$(W_MSIBUILDDIR)\extensions.wixobj" "$(W_MSIBUILDDIR)\*.fragment.wixobj" -o $(MSIOUTFILE)
 	chmod 644 $(MSIOUTFILE)
 
 package-msi: light
-- 
2.26.2