From be241207c29357c3cbda2eddb1002930d2e0592c Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 15 Dec 2014 21:15:24 +1100 Subject: [PATCH] ctdb-build: Fix the installation of config files for top-level build Signed-off-by: Amitay Isaacs Reviewed-by: Michael Adam Reviewed-by: Stefan Metzmacher --- ctdb/wscript | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ctdb/wscript b/ctdb/wscript index 865cb3a61c8..d1b8e9e8858 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', -- 2.34.1