54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript
|
|
--- samba-4.4.6/ctdb/wscript 2016-09-22 09:42:48.000000000 +0300
|
|
+++ samba-4.4.6-new/ctdb/wscript 2016-10-15 23:31:13.932088237 +0300
|
|
@@ -581,7 +581,7 @@
|
|
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])
|
|
|
|
bld.SAMBA_GENERATOR('ctdb-functions',
|
|
@@ -601,23 +601,19 @@
|
|
]
|
|
|
|
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=0755)
|
|
|
|
bld.SAMBA_GENERATOR('ctdb-sudoers',
|
|
source='config/ctdb.sudoers',
|
|
target='ctdb.sudoers',
|
|
rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
|
|
- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
|
|
+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
|
|
destname='ctdb')
|
|
|
|
- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
|
|
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
|
|
destname='README')
|
|
|
|
- bld.install_dir(bld.env.CTDB_LOGDIR)
|
|
- bld.install_dir(bld.env.CTDB_RUNDIR)
|
|
- bld.install_dir(bld.env.CTDB_VARDIR)
|
|
-
|
|
# Unit tests
|
|
ctdb_unit_tests = [
|
|
'db_hash_test',
|
|
diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
|
|
--- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300
|
|
+++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300
|
|
@@ -416,11 +416,3 @@
|
|
public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
|
|
header_path='samba',
|
|
cflags=cflags)
|
|
-
|
|
- # install some extra empty directories
|
|
- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
|
|
- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
|
|
- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
|
|
-
|
|
- # these might be on non persistent storage
|
|
- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
|