[vlc-commits] Win32: Correctly layout the files for the XPI

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Aug  2 21:26:08 2014 +0200| [cce683f71728cf2a39d97665e3b5dc30a24734ee] | committer: Jean-Baptiste Kempf

Win32: Correctly layout the files for the XPI

Close #11856

(cherry picked from commit 70e212146138688b9cb5c4df1f545ea91c2cac2a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/package/win32/package.mak |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 0b7abf8..489024c 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -106,12 +106,12 @@ package-win-strip: package-win-common
 
 
 package-win32-webplugin-common: package-win-strip
-	mkdir -p "$(win32_xpi_destdir)/"
-	cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/"
-	find $(prefix) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
+	mkdir -p "$(win32_xpi_destdir)/plugins/"
+	cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins/"
+	cp "$(win32_destdir)/libvlc.dll" "$(win32_destdir)/libvlccore.dll" "$(win32_destdir)/npvlc.dll" "$(win32_xpi_destdir)/plugins/"
 	cp $(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins/"
 	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins/"
-	rm -rf "$(win32_xpi_destdir)/plugins/gui/"
+	rm -rf "$(win32_xpi_destdir)/plugins/plugins/gui/"
 
 
 package-win32-xpi: package-win32-webplugin-common