[vlc-commits] NSIS: Fix build

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Thu Feb  1 20:08:18 2018 +0100| [3a55edcc71960cc6080c7a410327b9d5910f2f18] | committer: Marvin Scholz

NSIS: Fix build

Adds the vlc_branding bitmap to EXTRA_DIST and corrects the path to it
in the NSIS script.

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

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

 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 0096a93271..9c794f6362 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 "NSIS/vlc_branding.bmp"
+  !define MUI_WELCOMEFINISHPAGE_BITMAP "vlc_branding.bmp"
   ; Banner for uninstaller
-  !define MUI_UNWELCOMEFINISHPAGE_BITMAP "NSIS/vlc_branding.bmp"
+  !define MUI_UNWELCOMEFINISHPAGE_BITMAP "vlc_branding.bmp"
 
 ; Installer pages
   ; Welcome page
diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 8f3de0dce2..0f4ee2b2b9 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -188,6 +188,7 @@ EXTRA_DIST += \
 	extras/package/win32/configure.sh \
 	extras/package/win32/NSIS/vlc.win32.nsi.in \
 	extras/package/win32/NSIS/spad.nsi.in \
+	extras/package/win32/NSIS/vlc_branding.bmp \
 	extras/package/win32/NSIS/languages/BengaliExtra.nsh \
 	extras/package/win32/NSIS/languages/BasqueExtra.nsh \
 	extras/package/win32/NSIS/languages/PortugueseBRExtra.nsh \