vlc.win32.nsi: libvlc.dll needs be copied into mozilla plugins directory as well.

diff --git a/configure.ac b/configure.ac
index 6833b83ab301837c64e1e0739f7ded124194d398..c57660d9a4b701a043f346ba6a8871dafdddc342 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5307,7 +5307,7 @@ AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no])
 AM_CONDITIONAL(BUILD_SHARED, [test "${enable_shared_libvlc}" != "no"])
 AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no"], [
   AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
-  FILE_LIBVLC_DLL="!insertmacro InstallFile libvlc.dll"],
+  FILE_LIBVLC_DLL="libvlc.dll"],
   FILE_LIBVLC_DLL="" )
 
 pic=no

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 8abc5cec79c9b488fc661cb06cbfc6ca8ef7dff7..dbbb82a0ff673c5407f39c278e6c2ec1787b4c96 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -13,6 +13,8 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 !define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"\r
 \r
+!define LIBVLC_DLL "@FILE_LIBVLC_DLL@"\r
+\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; General configuration ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -326,7 +328,9 @@ Section "Media player (required)" SEC01
 \r
   !insertmacro InstallFile vlc.exe\r
   !insertmacro InstallFile vlc.exe.manifest\r
-  @FILE_LIBVLC_DLL@\r
+  !if LIBVLC_DLL != ""\r
+  !insertmacro InstallFile $LIBVLC_DLL\r
+  !endif\r
   !insertmacro InstallFile *.txt\r
 \r
   !insertmacro InstallFolder plugins\r
@@ -442,6 +446,9 @@ Section /o "Mozilla plugin" SEC03
     StrCmp $R2 "" "${Index}-Loop" ""\r
 \r
     CopyFiles "$INSTDIR\mozilla\*" "$R2"\r
+    !if LIBVLC_DLL != ""\r
+    CopyFiles $LIBVLC_DLL "$R2"\r
+    !endif\r
     Goto "${Index}-Loop"\r
 \r
   "${Index}-End:"\r