vlc/vlc-2.2 | branch: master | Rafaël Carré <[email protected]> | Wed Feb 3 11:29:53 2016 +0100| [c423aea8648f7941e9202039d15a15c74d521b84] | committer: Rafaël Carré
win32: fix msi build Debian dropped winepath /usr/bin symlink: http://anonscm.debian.org/cgit/pkg-wine/wine.git/commit/?id=a778a9ba05d57fb6b969d3e21e3cc26e78dc672c (cherry picked from commit 50b19e4b3446f9f89ce5a996b82335bbed2ef88f) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c423aea8648f7941e9202039d15a15c74d521b84 --- 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 aad1214..03845b0 100644 --- a/extras/package/win32/msi.mak +++ b/extras/package/win32/msi.mak @@ -3,17 +3,17 @@ BUILT_SOURCES_distclean += \ extras/package/win32/msi/config.wxi endif -WIXPATH=`winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\bin'` +WIXPATH=`wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\bin'` HEAT=wine "$(WIXPATH)/heat.exe" CANDLE=wine "$(WIXPATH)/candle.exe" LIGHT=wine "$(WIXPATH)/light.exe" -VLCDIR=`winepath -s \`winepath -w '$(win32_destdir)'\`` +VLCDIR=`wine winepath -s \`wine winepath -w '$(win32_destdir)'\`` MSIDIR=$(abs_srcdir)/extras/package/win32/msi -W_MSIDIR=`winepath -w '$(MSIDIR)'` +W_MSIDIR=`wine winepath -w '$(MSIDIR)'` MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi -W_MSIBUILDDIR=`winepath -w '$(MSIBUILDDIR)'` +W_MSIBUILDDIR=`wine winepath -w '$(MSIBUILDDIR)'` MSIOUTFILE=vlc-$(VERSION).msi -WINE_C=`winepath c:` +WINE_C=`wine winepath c:` package-msi: heat candle light _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
