[vlc-commits] Fix win32 packaging after [3594b304b396a] in npapi

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Jul 15 22:33:31 2011 -0400| [c3a0140ccbd07731237b3cf2941778b6ebf70df3] | committer: Rafaël Carré

Fix win32 packaging after [3594b304b396a] in npapi

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

 Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 67d16f0..ad76287 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -754,7 +754,7 @@ if !HAVE_WIN64
 if !HAVE_WINCE
 	cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
-	cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
+	cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 endif
 endif
@@ -795,7 +795,7 @@ package-win32-webplugin-common: package-win-base
 	mkdir -p "$(win32_xpi_destdir)/plugins"
 	find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
 if !HAVE_WIN64
-	cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+	cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
 endif
 	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"
 	cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"
@@ -804,13 +804,13 @@ endif
 
 package-win32-xpi: package-win32-webplugin-common
 if !HAVE_WIN64
-	cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)"
+	cp $(top_builddir)/npapi-vlc/npapi/install.rdf "$(win32_xpi_destdir)"
 	cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
 endif
 
 package-win32-crx: package-win32-webplugin-common
 if !HAVE_WIN64
-	cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)"
+	cp $(top_builddir)/npapi-vlc/npapi/manifest.json "$(win32_xpi_destdir)"
 	crxmake --pack-extension "$(win32_xpi_destdir)" \
 		--extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 endif