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>

diff --git a/ctdb/wscript b/ctdb/wscript
index 865cb3a61c8e3f103ec03fa4c0e10cbf188ab280..d1b8e9e885824386cb58c520dd7772c4ee05ac99 100755 (executable)
--- 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',