diff -Naur bacula-2.2.1/autoconf/Make.common.in bacula-2.2.1.oden/autoconf/Make.common.in
--- bacula-2.2.1/autoconf/Make.common.in 2007-08-17 12:18:43.000000000 +0200
+++ bacula-2.2.1.oden/autoconf/Make.common.in 2007-09-03 18:59:01.000000000 +0200
@@ -59,7 +59,7 @@
CPPFLAGS = @CPPFLAGS@ @OPENSSL_INC@
LDFLAGS = @LDFLAGS@
TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
-#DEFS = @DEFS@ @LOCAL_DEFS@
+DEFS = -DCONFIG_DIR="\"@sysconfdir@\""
LIBS = @LIBS@
WRAPLIBS = @WRAPLIBS@
DINCLUDE = @DINCLUDE@
diff -Naur bacula-2.2.1/src/console/console.c bacula-2.2.1.oden/src/console/console.c
--- bacula-2.2.1/src/console/console.c 2007-06-09 11:25:27.000000000 +0200
+++ bacula-2.2.1.oden/src/console/console.c 2007-09-03 18:59:01.000000000 +0200
@@ -105,7 +105,7 @@
static int execcmd(FILE *input, BSOCK *UA_sock);
-#define CONFIG_FILE "bconsole.conf" /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/bconsole.conf" /* default configuration file */
static void usage()
{
diff -Naur bacula-2.2.1/src/dird/dird.c bacula-2.2.1.oden/src/dird/dird.c
--- bacula-2.2.1/src/dird/dird.c 2007-08-16 20:46:16.000000000 +0200
+++ bacula-2.2.1.oden/src/dird/dird.c 2007-09-03 18:59:01.000000000 +0200
@@ -85,7 +85,7 @@
extern URES res_all;
#endif
-#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/bacula-dir.conf" /* default configuration file */
static void usage()
{
diff -Naur bacula-2.2.1/src/filed/filed.c bacula-2.2.1.oden/src/filed/filed.c
--- bacula-2.2.1/src/filed/filed.c 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/filed/filed.c 2007-09-03 18:59:01.000000000 +0200
@@ -50,7 +50,7 @@
void *start_heap;
-#define CONFIG_FILE "bacula-fd.conf" /* default config file */
+#define CONFIG_FILE CONFIG_DIR "/bacula-fd.conf" /* default config file */
char *configfile = NULL;
static bool foreground = false;
diff -Naur bacula-2.2.1/src/gnome2-console/console.c bacula-2.2.1.oden/src/gnome2-console/console.c
--- bacula-2.2.1/src/gnome2-console/console.c 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/gnome2-console/console.c 2007-09-03 18:59:01.000000000 +0200
@@ -93,7 +93,7 @@
static guint initial;
static int numdir = 0;
-#define CONFIG_FILE "./bgnome-console.conf" /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/bgnome-console.conf" /* default configuration file */
static void usage()
{
diff -Naur bacula-2.2.1/src/stored/bcopy.c bacula-2.2.1.oden/src/stored/bcopy.c
--- bacula-2.2.1/src/stored/bcopy.c 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/stored/bcopy.c 2007-09-03 18:59:01.000000000 +0200
@@ -57,7 +57,7 @@
static uint32_t jobs = 0;
static DEV_BLOCK *out_block;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
char *configfile = NULL;
STORES *me = NULL; /* our Global resource */
bool forge_on = false; /* proceed inspite of I/O errors */
diff -Naur bacula-2.2.1/src/stored/bextract.c bacula-2.2.1.oden/src/stored/bextract.c
--- bacula-2.2.1/src/stored/bextract.c 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/stored/bextract.c 2007-09-03 18:59:01.000000000 +0200
@@ -64,7 +64,7 @@
static uint32_t wsize; /* write size */
static uint64_t fileAddr = 0; /* file write address */
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
char *configfile = NULL;
STORES *me = NULL; /* our Global resource */
bool forge_on = false;
diff -Naur bacula-2.2.1/src/stored/bls.c bacula-2.2.1.oden/src/stored/bls.c
--- bacula-2.2.1/src/stored/bls.c 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/stored/bls.c 2007-09-03 18:59:01.000000000 +0200
@@ -59,7 +59,7 @@
static uint32_t num_files = 0;
static ATTR *attr;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
char *configfile = NULL;
STORES *me = NULL; /* our Global resource */
bool forge_on = false;
diff -Naur bacula-2.2.1/src/stored/bscan.c bacula-2.2.1.oden/src/stored/bscan.c
--- bacula-2.2.1/src/stored/bscan.c 2007-08-21 16:18:13.000000000 +0200
+++ bacula-2.2.1.oden/src/stored/bscan.c 2007-09-03 18:59:01.000000000 +0200
@@ -100,7 +100,7 @@
static int num_media = 0;
static int num_files = 0;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
char *configfile = NULL;
STORES *me = NULL; /* our Global resource */
bool forge_on = false; /* proceed inspite of I/O errors */
diff -Naur bacula-2.2.1/src/stored/btape.c bacula-2.2.1.oden/src/stored/btape.c
--- bacula-2.2.1/src/stored/btape.c 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/stored/btape.c 2007-09-03 18:59:01.000000000 +0200
@@ -98,7 +98,7 @@
/* Static variables */
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
char *configfile = NULL;
#define MAX_CMD_ARGS 30
diff -Naur bacula-2.2.1/src/stored/stored.c bacula-2.2.1.oden/src/stored/stored.c
--- bacula-2.2.1/src/stored/stored.c 2007-06-23 11:58:34.000000000 +0200
+++ bacula-2.2.1.oden/src/stored/stored.c 2007-09-03 18:59:01.000000000 +0200
@@ -52,7 +52,7 @@
extern "C" void *device_initialization(void *arg);
-#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf" /* Default config file */
/* Global variables exported */
char OK_msg[] = "3000 OK\n";
diff -Naur bacula-2.2.1/src/tray-monitor/tray-monitor.c bacula-2.2.1.oden/src/tray-monitor/tray-monitor.c
--- bacula-2.2.1/src/tray-monitor/tray-monitor.c 2007-08-16 10:44:39.000000000 +0200
+++ bacula-2.2.1.oden/src/tray-monitor/tray-monitor.c 2007-09-03 18:59:01.000000000 +0200
@@ -102,7 +102,7 @@
PangoFontDescription *font_desc = NULL;
-#define CONFIG_FILE "./tray-monitor.conf" /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/tray-monitor.conf" /* default configuration file */
static void usage()
{
diff -Naur bacula-2.2.1/src/wx-console/wxbmainframe.cpp bacula-2.2.1.oden/src/wx-console/wxbmainframe.cpp
--- bacula-2.2.1/src/wx-console/wxbmainframe.cpp 2007-06-07 16:46:43.000000000 +0200
+++ bacula-2.2.1.oden/src/wx-console/wxbmainframe.cpp 2007-09-03 18:59:01.000000000 +0200
@@ -403,7 +403,7 @@
}
configfile += L"Library/Preferences/org.bacula.wxconsole.conf";
#else
- wxFileName filename(::wxGetCwd(), wxT("bwx-console.conf"));
+ wxFileName filename(CONFIG_DIR, wxT("bwx-console.conf"));
filename.MakeAbsolute();
configfile = filename.GetLongPath();
#ifdef HAVE_WIN32
