diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-07-06 16:37:55 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-07-11 11:48:38 +0200 |
| commit | be1c3400587ccf4f04fa56f438cf815a12e04326 (patch) | |
| tree | 3f1349e73652b1c9aa9b97151a7601427c924349 /ctdb/wscript | |
| parent | 7c4848a4b3c7b073727f633863e0a92d413c3513 (diff) | |
| download | samba-be1c3400587ccf4f04fa56f438cf815a12e04326.tar.gz | |
ctdb-build: Add CTDB_DATADIR
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/wscript')
| -rw-r--r-- | ctdb/wscript | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 8ae3f89b1e7..91fc0012919 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -246,6 +246,7 @@ def configure(conf): sys.exit(1) conf.env.CTDB_BINDIR = os.path.join(conf.env.EXEC_PREFIX, 'bin') + conf.env.CTDB_DATADIR = os.path.join(conf.env.EXEC_PREFIX, 'share/ctdb') conf.env.CTDB_ETCDIR = os.path.join(conf.env.SYSCONFDIR, 'ctdb') conf.env.CTDB_VARDIR = os.path.join(conf.env.LOCALSTATEDIR, 'lib/ctdb') conf.env.CTDB_RUNDIR = os.path.join(conf.env.LOCALSTATEDIR, 'run/ctdb') @@ -265,17 +266,18 @@ def configure(conf): conf.ADD_CFLAGS('''-DCTDB_HELPER_BINDIR=\"%s\" -DLOGDIR=\"%s\" + -DCTDB_DATADIR=\"%s\" -DCTDB_ETCDIR=\"%s\" -DCTDB_VARDIR=\"%s\" -DCTDB_RUNDIR=\"%s\"''' % ( conf.env.CTDB_HELPER_BINDIR, conf.env.CTDB_LOGDIR, + conf.env.CTDB_DATADIR, conf.env.CTDB_ETCDIR, conf.env.CTDB_VARDIR, conf.env.CTDB_RUNDIR)) - conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, - 'share/ctdb/tests') + conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests') conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') # Allow unified compilation and separate compilation of utilities @@ -673,9 +675,10 @@ def build(bld): sed_expr5 = 's|/usr/local/sbin|%s|g' % (bld.env.SBINDIR) sed_expr6 = 's|/usr/local/libexec/ctdb|%s|g' % (bld.env.CTDB_HELPER_BINDIR) sed_expr7 = 's|/usr/local/bin|%s|g' % (bld.env.BINDIR) - sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \ + sed_expr8 = 's|/usr/local/share/ctdb|%s|g' % (bld.env.CTDB_DATADIR) + sed_cmdline = '-e "%s" ' * 8 % \ (sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5, - sed_expr6, sed_expr7) + sed_expr6, sed_expr7, sed_expr8) manpages_extra = manpages_misc if bld.env.etcd_reclock: |