From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 23 Oct 2008 16:33:02 +0000 (+0000)
Subject: Add exchange-fd.dll to Win32 installer
X-Git-Tag: Release-3.0.0~719
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3a928c07c8a749701a98ba1198a87baee4432730;p=bacula%2Fbacula

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 971b420d13..a52659da1e 100644
--- 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 ba32af14c8..f6353d07fc 100644
--- 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"
 
   File "${SRC_DIR}\bacula-fd.exe"
-; File "${SRC_DIR}\exchange-fd.dll"
+  File "${SRC_DIR}\exchange-fd.dll"
 
   ${If} $InstallType = ${MigrateInstall}
   ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"