diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-23 18:03:17 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-06-24 07:23:13 +0200 |
| commit | 4f6d668cfa7c34c10cf180f3cef84b151eba5ea1 (patch) | |
| tree | 38d084a4b34d71b5f36a84163d8c272b7147fad6 /ctdb/wscript | |
| parent | 7793aa56178ad16a6bbe60d8781928cfc7feea38 (diff) | |
| download | samba-4f6d668cfa7c34c10cf180f3cef84b151eba5ea1.tar.gz samba-4f6d668cfa7c34c10cf180f3cef84b151eba5ea1.tar.xz samba-4f6d668cfa7c34c10cf180f3cef84b151eba5ea1.zip | |
ctdb-build: Use CTDB_ETCDIR instead of ETCDIR/ctdb
This avoids hardcoding path components in source.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/wscript')
| -rwxr-xr-x | ctdb/wscript | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 5808ae2459..1dcc11cbc2 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -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)) |