From b531f67094a5e0166003126d73020986d91bc84a Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sun, 6 Aug 2006 09:21:18 +0000 Subject: [PATCH] Fix Linux build problem. I had tested this on Linux but I accidently put the change into Makefile instead of Makefile.in. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3259 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/Makefile.in | 2 ++ bacula/src/cats/cats.h | 1 - bacula/src/win32/installer/winbacula.nsi | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index 564d503ce1..562488f707 100644 --- 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 1c723354da..3e790f5dcb 100644 --- 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 e68f2457f9..3f00363b49 100644 --- 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" -- 2.39.5