--- bacula-1.38.5/autoconf/Make.common.in--     2006-02-28 21:07:56.000000000 +0100
+++ bacula-1.38.5/autoconf/Make.common.in       2006-02-28 21:08:26.000000000 +0100
@@ -53,7 +53,7 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
-#DEFS = @DEFS@ @LOCAL_DEFS@
+DEFS = -DCONFIG_DIR="\"@sysconfdir@\""
 LIBS = @LIBS@
 WRAPLIBS = @WRAPLIBS@
 DINCLUDE = @DINCLUDE@
--- bacula-1.38.5/src/console/console.c--	2006-02-28 15:29:31.000000000 +0100
+++ bacula-1.38.5/src/console/console.c	2006-02-28 15:29:49.000000000 +0100
@@ -94,7 +94,7 @@
 static int sleepcmd(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()
 {
--- bacula-1.38.5/src/filed/filed.c--	2006-01-15 11:11:59.000000000 +0100
+++ bacula-1.38.5/src/filed/filed.c	2006-02-28 15:25:02.000000000 +0100
@@ -47,7 +47,7 @@
 #endif
 
 
-#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;
--- bacula-1.38.5/src/gnome2-console/console.c--	2005-12-10 14:18:03.000000000 +0100
+++ bacula-1.38.5/src/gnome2-console/console.c	2006-02-28 15:24:07.000000000 +0100
@@ -80,7 +80,7 @@
 static guint initial;
 static int numdir = 0;
 
-#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/gnome-console.conf"   /* default configuration file */
 
 static void usage()
 {
--- bacula-1.38.5/src/stored/bcopy.c--	2006-02-28 15:15:59.000000000 +0100
+++ bacula-1.38.5/src/stored/bcopy.c	2006-02-28 15:23:30.000000000 +0100
@@ -44,7 +44,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 */
--- bacula-1.38.5/src/stored/bextract.c--	2006-01-09 21:42:55.000000000 +0100
+++ bacula-1.38.5/src/stored/bextract.c	2006-02-28 15:22:56.000000000 +0100
@@ -57,7 +57,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;
--- bacula-1.38.5/src/stored/btape.c--	2006-01-09 23:34:33.000000000 +0100
+++ bacula-1.38.5/src/stored/btape.c	2006-02-28 15:21:57.000000000 +0100
@@ -85,7 +85,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
--- bacula-1.38.5/src/stored/bscan.c--	2005-12-14 22:43:16.000000000 +0100
+++ bacula-1.38.5/src/stored/bscan.c	2006-02-28 15:22:20.000000000 +0100
@@ -95,7 +95,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 */
--- bacula-1.38.5/src/stored/bls.c--	2005-10-26 16:02:05.000000000 +0200
+++ bacula-1.38.5/src/stored/bls.c	2006-02-28 15:23:07.000000000 +0100
@@ -51,7 +51,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;
--- bacula-1.38.5/src/stored/stored.c--	2005-12-19 15:06:41.000000000 +0100
+++ bacula-1.38.5/src/stored/stored.c	2006-02-28 15:21:24.000000000 +0100
@@ -37,7 +37,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";
--- bacula-1.38.5/src/wx-console/wxbmainframe.cpp--	2005-12-16 14:25:39.000000000 +0100
+++ bacula-1.38.5/src/wx-console/wxbmainframe.cpp	2006-02-28 15:20:41.000000000 +0100
@@ -383,8 +383,8 @@
                configfile += '/';
             configfile += "Library/Preferences/org.bacula.wxconsole.conf";
 #else
-            wxFileName filename(::wxGetCwd(), wxT("wx-console.conf"));
-            filename.MakeAbsolute();
+            wxFileName filename(CONFIG_DIR, wxT("wx-console.conf"));
+	    filename.MakeAbsolute();
             configfile = filename.GetLongPath();
 #ifdef HAVE_WIN32
             configfile.Replace(wxT("\\"), wxT("/"));
--- bacula-1.38.5/configure--	2006-02-28 15:18:24.000000000 +0100
+++ bacula-1.38.5/configure	2006-02-28 15:19:02.000000000 +0100
@@ -30683,7 +30683,7 @@
 s,@WLDFLAGS@,$WLDFLAGS,;t t
 s,@WRAPLIBS@,$WRAPLIBS,;t t
 s,@OBJLIST@,$OBJLIST,;t t
-s,@hostname@,$hostname,;t t
+s,@hostname@,localhost,;t t
 s,@TAPEDRIVE@,$TAPEDRIVE,;t t
 s,@PSCMD@,$PSCMD,;t t
 s,@WIN32@,$WIN32,;t t