From: Jean-Baptiste Kempf Date: Tue, 12 Aug 2014 20:55:59 +0000 (+0200) Subject: XPI: use win32/win64 as package name X-Git-Tag: 3.0.0-git~15347 X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=293b492790d1003e91a5f8b99167a924aaa8daea XPI: use win32/win64 as package name Ref #11856 --- diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index 1cc525f3dd..1383a77f82 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -117,13 +117,13 @@ package-win32-webplugin-common: package-win-strip package-win32-xpi: package-win32-webplugin-common cp $(top_builddir)/npapi-vlc/npapi/package/install.rdf "$(win32_xpi_destdir)/" - cd $(win32_xpi_destdir) && zip -r -9 "../vlc-$(VERSION).xpi" install.rdf plugins + cd $(win32_xpi_destdir) && zip -r -9 "../$(WINVERSION).xpi" install.rdf plugins package-win32-crx: package-win32-webplugin-common cp $(top_builddir)/npapi-vlc/npapi/package/manifest.json "$(win32_xpi_destdir)/" crxmake --pack-extension "$(win32_xpi_destdir)" \ - --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf + --extension-output "$(win32_destdir)/$(WINVERSION).crx" --ignore-file install.rdf # nsis is a 32-bits installer, we need to build a 32bits DLL