XPI: use win32/win64 as package name
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 12 Aug 2014 20:55:59 +0000 (22:55 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 12 Aug 2014 20:55:59 +0000 (22:55 +0200)
Ref #11856

extras/package/win32/package.mak

index 1cc525f..1383a77 100644 (file)
@@ -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)/"
 
 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)" \
 
 
 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
 
 
 # nsis is a 32-bits installer, we need to build a 32bits DLL