[vlc-commits] configure/package: Fix 7zip variable name

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Mar 16 13:14:48 2018 +0100| [4f8dd8964a33a9263bfd988802c67052c97615d2] | committer: Hugo Beauzée-Luyssen

configure/package: Fix 7zip variable name

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

 configure.ac                     | 2 +-
 extras/package/win32/package.mak | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd54e820d1..135266daf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4194,7 +4194,7 @@ AS_IF([test "${SYS}" = "mingw32"], [
     dnl
     dnl Find 7zip
     dnl
-    AC_PATH_PROG([7ZIP], [7z], [7z])
+    AC_PATH_PROG([SEVENZIP], [7z], [7z])
 ])
 AM_CONDITIONAL(HAVE_MAKENSIS, [test "x$MAKENSIS" != "xno" && test "$nsis_version_ok" == "yes"])
 
diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 9d112a6cc4..c65bef4ce6 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -148,10 +148,10 @@ package-win32-debug-zip: package-win-common
 	zip -r -9 $(WINVERSION)-debug.zip vlc-$(VERSION)
 
 package-win32-7zip: package-win-strip
-	$(7ZIP) a $(7ZIP_OPTS) $(WINVERSION).7z vlc-$(VERSION)
+	$(SEVENZIP) a $(7ZIP_OPTS) $(WINVERSION).7z vlc-$(VERSION)
 
 package-win32-debug-7zip: package-win-common
-	$(7ZIP) a $(7ZIP_OPTS) $(WINVERSION)-debug.7z vlc-$(VERSION)
+	$(SEVENZIP) a $(7ZIP_OPTS) $(WINVERSION)-debug.7z vlc-$(VERSION)
 
 package-win32-cleanup:
 	rm -Rf $(win32_destdir) $(win32_debugdir) $(win32_xpi_destdir)
@@ -176,7 +176,7 @@ package-win32-release: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll pac
 	cp    $(top_srcdir)/extras/package/win32/msi/LICENSE.rtf	  "$(win32_destdir)/msi/"
 	cp    $(top_srcdir)/extras/package/win32/msi/product.wxs	  "$(win32_destdir)/msi/"
 
-	$(7ZIP) a $(7ZIP_OPTS) $(WINVERSION)-release.7z $(win32_debugdir) "$(win32_destdir)/"
+	$(SEVENZIP) a $(7ZIP_OPTS) $(WINVERSION)-release.7z $(win32_debugdir) "$(win32_destdir)/"
 
 #######
 # WinCE