Add exchange-fd.dll to Win32 installer

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7882 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/installer/Makefile b/bacula/src/win32/installer/Makefile
index 971b420d136f4d60a4d20bfdde651db3cf92f087..a52659da1ef86b68ad46554fd987ca6a8802363c 100644 (file)
--- a/bacula/src/win32/installer/Makefile
+++ b/bacula/src/win32/installer/Makefile
@@ -15,13 +15,14 @@ DEFINES := \
        -DSRC_DIR=release \
        -DBUILD_TOOLS=MinGW \
 
-INSTALL_EXE := ../release/winbacula-$(VERSION).exe
+INSTALL_EXE := $(BUILDDIR)/release/winbacula-$(VERSION).exe
 
 BACULA_BINARIES := \
        bacula.dll \
        cats_mysql.dll \
        cats_postgresql.dll \
        cats_sqlite3.dll \
+       exchange-fd.dll \
        bacula-dir.exe \
        bacula-fd.exe \
        bacula-sd.exe \
@@ -178,4 +179,4 @@ $(INSTALL_EXE): winbacula.nsi $(addprefix release/,$(BACULA_BINARIES) $(SCRIPT_F
        NSISDIR=$(NSIS_DIR) \
        $(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi
 
-include ../Makefile.rules
+include $(BUILDDIR)/Makefile.rules

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index ba32af14c8fa1a1f8a2c22725e96627a82b19f71..f6353d07fccb67d00b03fb1426d96ffda184721a 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -564,7 +564,7 @@ Section "File Service" SecFileDaemon
   SetOutPath "$INSTDIR\bin"\r
 \r
   File "${SRC_DIR}\bacula-fd.exe"\r
-; File "${SRC_DIR}\exchange-fd.dll"\r
+  File "${SRC_DIR}\exchange-fd.dll"\r
 \r
   ${If} $InstallType = ${MigrateInstall}\r
   ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"\r