diff --git a/ctdb/wscript b/ctdb/wscript index e9cd89436a3..893b9a4c59e 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -862,7 +862,7 @@ def build(bld): for t in etc_subdirs: 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], + bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0], destname=fmode[0], chmod=fmode[1]) # If this is a direct install and there are no event scripts @@ -901,17 +901,13 @@ def build(bld): ] for t in etc_scripts: - bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t, + bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t, destname=t, chmod=MODE_755) - bld.INSTALL_FILES('${CTDB_ETCDIR}/events/notification', + bld.INSTALL_FILES('${EXEC_PREFIX}$${CTDB_ETCDIR}/events/notification', 'config/notification.README', destname='README') - bld.INSTALL_DIR(bld.env.CTDB_LOGDIR) - bld.INSTALL_DIR(bld.env.CTDB_RUNDIR) - bld.INSTALL_DIR(bld.env.CTDB_VARDIR) - for d in ['volatile', 'persistent', 'state']: bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))