Fix win32 packaging after [3594b304b396a] in npapi

diff --git a/Makefile.am b/Makefile.am
index 67d16f0ea8bb34352b10d62225cf666833037b7b..ad7628709696132ee214e887ed375eda1ae43565 100644 (file)
--- 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