X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=355d8d34ce853e2614fbc8c1b792c281a0f74cb5;hb=6eedf20f375a3cfe4ab475ec3a31fd7f83a5dd19;hp=a87e20845d8dc8c73e3f1b52952fd4081762bca0;hpb=44fb88bf44e59febfa60ac9ca3ff9ff484ecbaf6;p=vlc diff --git a/Makefile.am b/Makefile.am index a87e20845d..355d8d34ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -727,10 +727,6 @@ package-win-common: mkdir -p $(win32_destdir)/locale/qt4/ cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true -# Copy the UAC NSIS plugin - cp "$(srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/" - cp "$(srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/" - # Mozilla plugin if BUILD_MOZILLA mkdir -p "$(win32_destdir)/mozilla" @@ -753,6 +749,11 @@ endif find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi +# Copy the UAC NSIS plugin + mkdir -p "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS" + package-win32-xpi: package-win-common-strip mkdir -p "$(win32_xpi_destdir)/plugins" cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"