[vlc-commits] NSIS: Fix build

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Thu Feb  1 21:43:48 2018 +0100| [c188d7d68ce9f13497d7c9e6165dcea7607bca01] | committer: Marvin Scholz

NSIS: Fix build

Copy missing file to the installer build directory and adjust paths to
match the copy destination.

(cherry picked from commit 495ca838988b072fcfbf79a62b5cbeb60c09c15c)
Signed-off-by: Marvin Scholz <epirat07 at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c188d7d68ce9f13497d7c9e6165dcea7607bca01
---

 extras/package/win32/NSIS/vlc.win32.nsi.in | 4 ++--
 extras/package/win32/package.mak           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 9c794f6362..0096a93271 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -80,9 +80,9 @@ RequestExecutionLevel admin
   !define MUI_COMPONENTSPAGE_SMALLDESC
 
   ; Banner (welcome and finish page) for installer
-  !define MUI_WELCOMEFINISHPAGE_BITMAP "vlc_branding.bmp"
+  !define MUI_WELCOMEFINISHPAGE_BITMAP "NSIS/vlc_branding.bmp"
   ; Banner for uninstaller
-  !define MUI_UNWELCOMEFINISHPAGE_BITMAP "vlc_branding.bmp"
+  !define MUI_UNWELCOMEFINISHPAGE_BITMAP "NSIS/vlc_branding.bmp"
 
 ; Installer pages
   ; Welcome page
diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 0f4ee2b2b9..b9ae7a2d9f 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -126,6 +126,7 @@ package-win32-exe: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll extras/
 	cp -r $(srcdir)/extras/package/win32/NSIS/languages    "$(win32_destdir)/"
 	cp -r $(srcdir)/extras/package/win32/NSIS/helpers      "$(win32_destdir)/"
 	cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh" "$(win32_destdir)/NSIS/"
+	cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp" "$(win32_destdir)/NSIS/"
 
 # Create package
 	if makensis -VERSION >/dev/null 2>&1; then \