[vlc-devel] [PATCH 6/7] win32: msi: use the detected way to handle windows pathes

[Steve Lhomme]

Rather than hardcoding "wine winepath".
---
 extras/package/win32/msi.mak | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index a8db35699696..e7e36bd64e74 100644
--- a/extras/package/win32/msi.mak
+++ b/extras/package/win32/msi.mak
@@ -3,21 +3,21 @@ BUILT_SOURCES_distclean += \
 	extras/package/win32/msi/config.wxi
 endif
 
-WIXPATH=`wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\bin'`
+WIXPATH=`$(WIN32_PATH_CMD) -u 'C:\Program Files (x86)\Windows Installer XML v3.5\bin'`
 HEAT=$(RUN_HOST_CMD) "$(WIXPATH)/heat.exe"
 CANDLE=$(RUN_HOST_CMD) "$(WIXPATH)/candle.exe"
 LIGHT=$(RUN_HOST_CMD) "$(WIXPATH)/light.exe"
-W_VLCDIR=`wine winepath -w '$(abs_top_builddir)/vlc-$(VERSION)'`
+W_VLCDIR=`$(WIN32_PATH_CMD) -w '$(abs_top_builddir)/vlc-$(VERSION)'`
 MSIDIR=$(abs_srcdir)/extras/package/win32/msi
-W_MSIDIR=`wine winepath -w '$(MSIDIR)'`
+W_MSIDIR=`$(WIN32_PATH_CMD) -w '$(MSIDIR)'`
 MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi
-W_MSIBUILDDIR=`wine winepath -w '$(MSIBUILDDIR)'`
+W_MSIBUILDDIR=`$(WIN32_PATH_CMD) -w '$(MSIBUILDDIR)'`
 if HAVE_WIN64
 MSIOUTFILE=vlc-$(VERSION)-win64.msi
 else
 MSIOUTFILE=vlc-$(VERSION)-win32.msi
 endif
-WINE_C=`wine winepath -u c:`
+WINE_C=`$(WIN32_PATH_CMD) -u c:`
 
 heat: package-win-strip
 	$(HEAT) dir "$(W_VLCDIR)/plugins" -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out "$(W_MSIBUILDDIR)\Plugins.fragment.wxs"
-- 
2.26.2