diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-23 15:20:44 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-06-24 07:23:13 +0200 |
| commit | 7793aa56178ad16a6bbe60d8781928cfc7feea38 (patch) | |
| tree | 41c27a2dc357e3752495a9430ad1f5a7825520c8 /ctdb | |
| parent | 8cd48c6b1cbdc7b2d151985a044e0bff12269a1a (diff) | |
| download | samba-7793aa56178ad16a6bbe60d8781928cfc7feea38.tar.gz | |
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>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tcp/tcp_connect.c | 2 | ||||
| -rwxr-xr-x | ctdb/wscript | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c index 8032662a29b..8a112ff68b8 100644 --- 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 afd40d3399e..5808ae24594 100755 --- 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') |