[vlc-commits] package/win32: Use MAKENSIS found by configure

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Mar 16 01:51:26 2018 +0100| [1b915a83b06c08672b1459dda8f0f9b08c387303] | committer: Marvin Scholz

package/win32: Use MAKENSIS found by configure

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

 extras/package/win32/package.mak | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 7ee38cd994..c166dfdef0 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -121,7 +121,7 @@ else
 	$(STRIP) $@
 endif
 
-
+if HAVE_MAKENSIS
 package-win32-exe: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll extras/package/win32/NSIS/vlc.win32.nsi
 # Script installer
 	cp    $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi "$(win32_destdir)/"
@@ -132,20 +132,12 @@ package-win32-exe: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll extras/
 	cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp" "$(win32_destdir)/NSIS/"
 
 # Create package
-	if makensis -VERSION >/dev/null 2>&1; then \
-	    MAKENSIS="makensis"; \
-	elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
-	    MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
-	else \
-	    echo 'Error: cannot locate makensis tool'; exit 1; \
-	fi; \
-	MAKENSIS_VERSION=`makensis -VERSION`; echo $${MAKENSIS_VERSION:1:1}; \
-	if [ $${MAKENSIS_VERSION:1:1} -lt 3 ]; then \
-	    echo 'Please update your nsis packager';\
-	    exit 1; \
-	fi; \
-	eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
-	eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
+	$(MAKENSIS) "$(win32_destdir)/spad.nsi"
+	$(MAKENSIS) "$(win32_destdir)/vlc.win32.nsi"
+else
+package-win32-exe:
+	@echo "makensis require to build NSIS installer not found or too old"; exit 1;
+endif
 
 package-win32-zip: package-win-strip
 	rm -f -- $(WINVERSION).zip