ctdb-build: Use CTDB_RUNDIR instead of VARDIR/run/ctdb

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index 8032662a29b66688622043a56d7bca608c6f7b32..8a112ff68b89829c20ec6e5400d651c437571815 100644 (file)
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -293,7 +293,7 @@ static int ctdb_tcp_listen_automatic(struct ctdb_context *ctdb)
                                                struct ctdb_tcp);
         ctdb_sock_addr sock;
        int lock_fd, i;
-       const char *lock_path = VARDIR "/run/ctdb/.socket_lock";
+       const char *lock_path = CTDB_RUNDIR "/.socket_lock";
        struct flock lock;
        int one = 1;
        int sock_size;

diff --git a/ctdb/wscript b/ctdb/wscript
index afd40d3399e95628c753d0775c7de32df6943386..5808ae24594034cd4d8a7715212b9c81ff19c3db 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -130,15 +130,16 @@ def configure(conf):
         conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_RUNDIR,
                                               'ctdbd.socket')
 
-    conf.ADD_CFLAGS('''-DBINDIR=\"%s\" -DETCDIR=\"%s\" -DVARDIR=\"%s\"
+    conf.ADD_CFLAGS('''-DBINDIR=\"%s\" -DETCDIR=\"%s\"
                        -DLOGDIR=\"%s\" -DSOCKPATH=\"%s\"
-                       -DCTDB_VARDIR=\"%s\"''' % (
+                       -DCTDB_VARDIR=\"%s\"
+                       -DCTDB_RUNDIR=\"%s\"''' % (
                     conf.env.CTDB_BINDIR,
                     conf.env.CTDB_ETCDIR,
-                    conf.env.CTDB_VARDIR,
                     conf.env.CTDB_LOGDIR,
                     conf.env.CTDB_SOCKPATH,
-                    conf.env.CTDB_VARDIR))
+                    conf.env.CTDB_VARDIR,
+                    conf.env.CTDB_RUNDIR))
 
     conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX,
                                               'share/ctdb-tests')