- vlc.win32.nsi.in: second attempt

diff --git a/configure.ac b/configure.ac
index c57660d9a4b701a043f346ba6a8871dafdddc342..496a4eeedd79edfab3962f0681ed2ae7ffa30f4f 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="libvlc.dll"],
+  FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
   FILE_LIBVLC_DLL="" )
 
 pic=no

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index dbbb82a0ff673c5407f39c278e6c2ec1787b4c96..2accf4cc6804b5227728ebc414e039dc573fdf01 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -13,7 +13,7 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 !define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"\r
 \r
-!define LIBVLC_DLL "@FILE_LIBVLC_DLL@"\r
+"@FILE_LIBVLC_DLL@"\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; General configuration ;\r
@@ -328,8 +328,8 @@ Section "Media player (required)" SEC01
 \r
   !insertmacro InstallFile vlc.exe\r
   !insertmacro InstallFile vlc.exe.manifest\r
-  !if LIBVLC_DLL != ""\r
-  !insertmacro InstallFile $LIBVLC_DLL\r
+  !ifdef LIBVLC_DLL\r
+  !insertmacro InstallFile ${LIBVLC_DLL}\r
   !endif\r
   !insertmacro InstallFile *.txt\r
 \r
@@ -446,8 +446,8 @@ 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
+    !ifdef LIBVLC_DLL\r
+    CopyFiles ${LIBVLC_DLL} "$R2"\r
     !endif\r
     Goto "${Index}-Loop"\r
 \r