From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 29 May 2007 05:20:41 +0000 (+1000)
Subject: use autoconf for more paths
X-Git-Tag: tevent-0.9.20~348^2~2650
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=873c3a5934000b0f0a15aa1a9c1020cd51ea51bb;p=thirdparty%2Fsamba.git

use autoconf for more paths
(This used to be ctdb commit b765a391632621dfe3b129b85782e87f586ae2eb)
---

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index a0e693876b7..da892542ee9 100644
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -10,6 +10,7 @@ bindir = @bindir@
 localstatedir = @localstatedir@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
+etcdir = @sysconfdir@
 builddir = @builddir@
 DESTDIR = /
 EXTRA_OBJ=@EXTRA_OBJ@
@@ -20,7 +21,7 @@ POPT_OBJ = @POPT_OBJ@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \
-	-DVARDIR=\"$(localstatedir)\" -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@
 
diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index 071b50b4355..dc0caa12f5e 100644
--- a/ctdb/common/cmdline.c
+++ b/ctdb/common/cmdline.c
@@ -39,7 +39,7 @@ static struct {
 	const char *logfile;
 	const char *events;
 } ctdb_cmdline = {
-	.nlist = "/etc/ctdb/nodes",
+	.nlist = ETCDIR "/ctdb/nodes",
 	.transport = "tcp",
 	.myaddress = NULL,
 	.socketname = CTDB_PATH,
diff --git a/ctdb/direct/ctdbd.c b/ctdb/direct/ctdbd.c
index cc92c333bf2..ff34a6d1d0e 100644
--- a/ctdb/direct/ctdbd.c
+++ b/ctdb/direct/ctdbd.c
@@ -43,7 +43,7 @@ static struct {
 	const char *public_interface;
 	const char *event_script;
 } options = {
-	.event_script = "/etc/ctdb/events"
+	.event_script = ETCDIR "/ctdb/events"
 };
 
 
diff --git a/ctdb/packaging/RHEL/ctdb.spec b/ctdb/packaging/RHEL/ctdb.spec
index 9d7f4ddcdca..59b1655565d 100644
--- a/ctdb/packaging/RHEL/ctdb.spec
+++ b/ctdb/packaging/RHEL/ctdb.spec
@@ -62,6 +62,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 install -m644 setup/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
 install -m755 setup/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
+install -m755 tools/events $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events
 
 # Remove "*.old" files
 find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;