Rev 381: use autoconf for more paths in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 381
revision-id: tridge at samba.org-20070529052041-dmvblb655nqxg7dx
parent: tridge at samba.org-20070529051500-0lhsk7t608qowp9i
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Tue 2007-05-29 15:20:41 +1000
message:
  use autoconf for more paths
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  common/cmdline.c               cmdline.c-20070416041216-w1zvz91bkdsgjckw-1
  direct/ctdbd.c                 ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
  packaging/RHEL/ctdb.spec       ctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-05-29 02:16:59 +0000
+++ b/Makefile.in	2007-05-29 05:20:41 +0000
@@ -10,6 +10,7 @@
 localstatedir = @localstatedir@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
+etcdir = @sysconfdir@
 builddir = @builddir@
 DESTDIR = /
 EXTRA_OBJ=@EXTRA_OBJ@
@@ -20,7 +21,7 @@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I at tallocdir@ -I at tdbdir@/include -I at 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@
 

=== modified file 'common/cmdline.c'
--- a/common/cmdline.c	2007-05-29 05:15:00 +0000
+++ b/common/cmdline.c	2007-05-29 05:20:41 +0000
@@ -39,7 +39,7 @@
 	const char *logfile;
 	const char *events;
 } ctdb_cmdline = {
-	.nlist = "/etc/ctdb/nodes",
+	.nlist = ETCDIR "/ctdb/nodes",
 	.transport = "tcp",
 	.myaddress = NULL,
 	.socketname = CTDB_PATH,

=== modified file 'direct/ctdbd.c'
--- a/direct/ctdbd.c	2007-05-29 02:49:25 +0000
+++ b/direct/ctdbd.c	2007-05-29 05:20:41 +0000
@@ -43,7 +43,7 @@
 	const char *public_interface;
 	const char *event_script;
 } options = {
-	.event_script = "/etc/ctdb/events"
+	.event_script = ETCDIR "/ctdb/events"
 };
 
 

=== modified file 'packaging/RHEL/ctdb.spec'
--- a/packaging/RHEL/ctdb.spec	2007-05-29 05:15:00 +0000
+++ b/packaging/RHEL/ctdb.spec	2007-05-29 05:20:41 +0000
@@ -62,6 +62,7 @@
 
 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 {} \;