sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

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

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2014-06-23 15:20:44 +10:00 committed by Martin Schwenke
parent 8cd48c6b1c
commit 7793aa5617
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tcp/tcp_connect.c
View File

@ -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;

9
ctdb/wscript
View File

@ -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')