use autoconf for more paths

(This used to be ctdb commit b765a391632621dfe3b129b85782e87f586ae2eb)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index a0e693876b7b0c1241359d0c40f5bc5445c9b3ae..da892542ee9cb75d65e8b6be91c49bed542a02c3 100644 (file)
--- 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 071b50b4355e2ecfc871de37c0a413d0cc80374a..dc0caa12f5ecdb9c38ffbedda43e1728f0f7a830 100644 (file)
--- 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 cc92c333bf202bee19ecd17f65d959c758f363b4..ff34a6d1d0eade8e6acbb9d76530ef2b2fc71fad 100644 (file)
--- 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 9d7f4ddcdca10aa4aaffdffb51145c33e8032625..59b1655565d127153b54707c3014f3a11dd4ad97 100644 (file)
--- 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 {} \;