From: Damien Fouilleul <damienf@videolan.org>
Date: Fri, 5 May 2006 23:09:43 +0000 (+0000)
Subject: vlc.win32.nsi: libvlc.dll needs be copied into mozilla plugins directory as well.
X-Git-Tag: 0.9.0-test0~11312
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c75bb43a846709c6f5baaa243a7f84628f03f8a9;p=vlc

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

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