diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-12-15 21:15:24 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-12-17 21:16:12 +0100 |
| commit | 6c015129d34a3d68cc3fa840436ca8b9904fdf6a (patch) | |
| tree | e0eb8da74070f1884c9843d6fc34a3a5848a6cd9 /ctdb/wscript | |
| parent | d09a0e0e0bb904e24c2f69af2831bd9710133d5f (diff) | |
| download | samba-6c015129d34a3d68cc3fa840436ca8b9904fdf6a.tar.gz | |
ctdb-build: Fix the installation of config files for top-level build
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit be241207c29357c3cbda2eddb1002930d2e0592c)
Diffstat (limited to 'ctdb/wscript')
| -rwxr-xr-x | ctdb/wscript | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index dfae5b4b564..e4294c34e2c 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -464,8 +464,13 @@ def build(bld): 'nfs-rpc-checks.d' ] + if bld.env.standalone_ctdb: + configdir = 'config' + else: + configdir = 'ctdb/config' + for t in etc_subdirs: - files = SUBDIR_MODE('config/%s' % t, trim_path='config') + files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir) for fmode in files: bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0], destname=fmode[0], chmod=fmode[1]) @@ -483,7 +488,7 @@ def build(bld): ] for t in etc_scripts: - bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/' + t, + bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t, destname=t, chmod=0755) bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers', |