From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 16 Mar 2010 14:56:36 +0000 (+0100)
Subject: Fix Win64 build
X-Git-Tag: Release-5.2.1~1586
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=29f36637dc74e4aa5f1e1c350f9905e3bd530bbc;p=bacula%2Fbacula

Fix Win64 build
---

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index e3ce8d880d..3bea6ece63 100644
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -34,6 +34,7 @@ endif
 all: Makefile.inc $(DIRS) $(SPECIAL) $(INSTALLER)
 
 clean: $(DIRS) win32_installer win64_installer
+	$(MAKE) -C tools clean
 	$(ECHO_CMD)-rm -rf release32 release64
 
 bat:
@@ -91,7 +92,7 @@ Makefile.inc:
 	@echo Creating $@
 	$(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \
 	TOPDIR=$${DEPKGS:-$${TOPDIR}}; \
-	if test "$(WIN64)" = yes -a -e $${TOPDIR}/cross-tools/mingw-w64/bin/x86_64-pc-mingw32-gcc; then \
+	if test "$(win64)" = yes -a -e $${TOPDIR}/cross-tools/mingw-w64/bin/x86_64-pc-mingw32-gcc; then \
 		BINDIR=$${TOPDIR}/cross-tools/mingw-w64/bin; \
 		INCDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/include; \
 		DLLDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/bin; \