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

ctdb-build: Use CTDB_ETCDIR instead of ETCDIR/ctdb

Browse Source 
This avoids hardcoding path components in 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 18:03:17 +10:00 committed by Martin Schwenke
parent 7793aa5617
commit 4f6d668cfa
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/server/ctdbd.c
View File

@ -240,7 +240,7 @@ int main(int argc, const char *argv[])
ctdb->pnn = -1;
/* Default value for CTDB_BASE - don't override */
setenv("CTDB_BASE", ETCDIR "/ctdb", 0);
setenv("CTDB_BASE", CTDB_ETCDIR, 0);
/* tell ctdb what nodes are available */
if (options.nlist != NULL) {

2
ctdb/server/eventscript.c
View File

@ -440,7 +440,7 @@ static void debug_hung_script_done(struct tevent_context *ev, struct tevent_fd *
static void ctdb_run_debug_hung_script(struct ctdb_context *ctdb, struct debug_hung_script_state *state)
{
pid_t pid;
const char * debug_hung_script = ETCDIR "/ctdb/debug-hung-script.sh";
const char * debug_hung_script = CTDB_ETCDIR "/debug-hung-script.sh";
int fd[2];
struct tevent_timer *ttimer;
struct tevent_fd *tfd;

2
ctdb/tools/ctdb.c
View File

@ -6536,7 +6536,7 @@ int main(int argc, const char *argv[])
control = extra_argv[0];
/* Default value for CTDB_BASE - don't override */
setenv("CTDB_BASE", ETCDIR "/ctdb", 0);
setenv("CTDB_BASE", CTDB_ETCDIR, 0);
ev = event_context_init(NULL);
if (!ev) {

8
ctdb/wscript
View File

@ -130,14 +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\"
-DLOGDIR=\"%s\" -DSOCKPATH=\"%s\"
conf.ADD_CFLAGS('''-DBINDIR=\"%s\"
-DLOGDIR=\"%s\"
-DSOCKPATH=\"%s\"
-DCTDB_ETCDIR=\"%s\"
-DCTDB_VARDIR=\"%s\"
-DCTDB_RUNDIR=\"%s\"''' % (
conf.env.CTDB_BINDIR,
conf.env.CTDB_ETCDIR,
conf.env.CTDB_LOGDIR,
conf.env.CTDB_SOCKPATH,
conf.env.CTDB_ETCDIR,
conf.env.CTDB_VARDIR,
conf.env.CTDB_RUNDIR))