Fix Linux build problem. I had tested this on Linux but I accidently put the change...

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

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 564d503ce1eefb29c7126b3272d091071b1c06db..562488f707e53359d53a5c36483d6bec18280ae3 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -11,6 +11,8 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/cats
 
+CPPFLAGS += -DBUILDING_CATS
+
 DEBUG=@DEBUG@
 MKDIR=$(topdir)/autoconf/mkinstalldirs
 

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 1c723354da543a889bceaf3258bd75cf75c84013..3e790f5dcbeee606ac4afc9198e052c628108aab 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -65,7 +65,6 @@ typedef int (DB_RESULT_HANDLER)(void *, int, char **);
 
 #ifdef __SQL_C
 
-#define BUILDING_CATS
 #if defined(BUILDING_CATS)
 #ifdef HAVE_SQLITE
 

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index e68f2457f91c100f756a3c48dc2569980b0760cc..3f00363b49da5a69426d92d0ceff496c5b5e59ab 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -280,7 +280,7 @@ Section "Storage Service" SecStorageDaemon
   File "bls.exe"
   File "bscan.exe"
   File "btape.exe"
-  File /oname=mtx-changer.cmd ..\scripts\mtx-changer.cmd.in
+  File ..\scripts\mtx-changer.cmd
 
   StrCpy $R0 0
   StrCpy $R1 "$APPDATA\Bacula\bacula-sd.conf"