diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-12-15 21:15:24 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-12-15 13:53:08 +0100 |
| commit | be241207c29357c3cbda2eddb1002930d2e0592c (patch) | |
| tree | ae938cc3507d1ef03d29b8f898d4f0485cac65ed /ctdb | |
| parent | 641bb5eab344fe85fb93898d5a8bc08d35e11fdc (diff) | |
| download | samba-be241207c29357c3cbda2eddb1002930d2e0592c.tar.gz samba-be241207c29357c3cbda2eddb1002930d2e0592c.tar.xz samba-be241207c29357c3cbda2eddb1002930d2e0592c.zip | |
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>
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/wscript | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 865cb3a61c..d1b8e9e885 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -467,8 +467,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]) @@ -486,7 +491,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', |