The branch, master has been updated
via 93d72bc wafsamba: Only use $DESTDIR in INSTALL_DIR() if it is set
from f84e372 dbwrap_ctdb: return correct record count for a persistent
db read-only traverse
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 93d72bcfb0dea3d7734771bbb550c45d642955c9
Author: Martin Schwenke <mar...@meltin.net>
Date: Thu Sep 13 10:54:48 2018 +1000
wafsamba: Only use $DESTDIR in INSTALL_DIR() if it is set
Otherwise the leading '/' is stripped and directories are created
relative to the current directory.
This fixes a regression introduced in recent commit
26ea0f58daace4adef7c5bb17f19476083bf3b7b.
Reported-by: Ralph Böhme <s...@samba.org>
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Thu Sep 13 09:37:23 CEST 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index dbcfe12..36bc6c3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -897,8 +897,9 @@ def INSTALL_DIR(bld, path, chmod=0o755, env=None):
if not path:
return []
- destpath = os.path.join(Options.options.destdir,
- bld.EXPAND_VARIABLES(path).lstrip(os.sep))
+ destpath = bld.EXPAND_VARIABLES(path)
+ if Options.options.destdir:
+ destpath = os.path.join(Options.options.destdir,
destpath.lstrip(os.sep))
if bld.is_install > 0:
if not os.path.isdir(destpath):
--
Samba Shared Repository
