tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1--- a/ctdb/wscript 2019-01-15 02:07:00.000000000 -0800
2+++ b/ctdb/wscript 2019-01-20 20:21:08.800187459 -0800
3@@ -814,7 +814,7 @@
4 for t in etc_subdirs:
5 files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
6 for fmode in files:
7- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
8+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
9 destname=fmode[0], chmod=fmode[1])
10
11 # If this is a direct install and there are no event scripts
12@@ -852,24 +852,20 @@
13 ]
14
15 for t in etc_scripts:
16- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
17+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
18 destname=t, chmod=MODE_755)
19
20 bld.SAMBA_GENERATOR('ctdb-sudoers',
21 source='config/ctdb.sudoers',
22 target='ctdb.sudoers',
23 rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
24- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
25+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
26 destname='ctdb')
27
28- bld.INSTALL_FILES('${CTDB_ETCDIR}/events/notification',
29+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/events/notification',
30 'config/notification.README',
31 destname='README')
32
33- bld.INSTALL_DIR(bld.env.CTDB_LOGDIR)
34- bld.INSTALL_DIR(bld.env.CTDB_RUNDIR)
35- bld.INSTALL_DIR(bld.env.CTDB_VARDIR)
36-
37 for d in ['volatile', 'persistent', 'state']:
38 bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))
39