Revert "from Mathieu Parent <math.parent@gmail.com>"

This reverts commit dc9cd4779db4a89697731e4cf415be51067a07c1.

Conflicts:

diff --git a/Makefile.in b/Makefile.in
index e51fec9bed0ebdada71bf635599937ae7beae0b4..cf1240b1f71af90ac27d5c75264e6485687827a4 100755 (executable)
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,6 @@ bindir = @bindir@
 sbindir = @sbindir@
 mandir = @mandir@
 localstatedir = @localstatedir@
-logdir = @logdir@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
 etcdir = @sysconfdir@
@@ -30,8 +29,8 @@ IPQ_LIBS = @IPQ_LIBS@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \
-       -DVARDIR=\"$(localstatedir)\" -DLOGDIR=\"$(logdir)\" \
-       -DETCDIR=\"$(etcdir)\" -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
+       -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
+       -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
 
 LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
 

diff --git a/server/ctdbd.c b/server/ctdbd.c
index 48e361f9ea64e93e228c16e5c45d4838b84d6e48..4dc0f74b2094384bea0d7154879f145d0fea9bcf 100644 (file)
--- a/server/ctdbd.c
+++ b/server/ctdbd.c
@@ -50,7 +50,7 @@ static struct {
        .nlist = ETCDIR "/ctdb/nodes",
        .transport = "tcp",
        .event_script_dir = ETCDIR "/ctdb/events.d",
-       .logfile = LOGDIR "/log.ctdb",
+       .logfile = VARDIR "/log/log.ctdb",
        .db_dir = VARDIR "/ctdb",
        .db_dir_persistent = VARDIR "/ctdb/persistent",
 };