1diff --git a/dynconfig/wscript b/dynconfig/wscript
2index aa4e66e..d53f433 100755
3--- a/dynconfig/wscript
4+++ b/dynconfig/wscript
5@@ -379,9 +379,9 @@ def build(bld):
6 cflags=cflags)
7
8 # install some extra empty directories
9- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
10- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
11- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
12+ #bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
13+ #bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
14+ #bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
15
16 # these might be on non persistent storage
17- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
18+ #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
19diff --git a/ctdb/wscript b/ctdb/wscript
20index 3e2a992..1b93a4d 100755
21--- a/ctdb/wscript
22+++ b/ctdb/wscript
23@@ -473,10 +473,10 @@ def build(bld):
24 for t in etc_subdirs:
25 files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
26 for fmode in files:
27- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
28+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
29 destname=fmode[0], chmod=fmode[1])
30
31- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions',
32+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions',
33 destname='functions')
34
35 etc_scripts = [
36@@ -489,18 +489,18 @@ def build(bld):
37 ]
38
39 for t in etc_scripts:
40- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
41+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
42 destname=t, chmod=0755)
43
44- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
45+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
46 destname='ctdb')
47
48- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
49+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
50 destname='README')
51
52- bld.install_dir(bld.env.CTDB_LOGDIR)
53- bld.install_dir(bld.env.CTDB_RUNDIR)
54- bld.install_dir(bld.env.CTDB_VARDIR)
55+ #bld.install_dir(bld.env.CTDB_LOGDIR)
56+ #bld.install_dir(bld.env.CTDB_RUNDIR)
57+ #bld.install_dir(bld.env.CTDB_VARDIR)
58
59 sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
60 t = bld.SAMBA_GENERATOR('ctdb-pc',