From: Martin Schwenke <martin@meltin.net>
Date: Mon, 10 Sep 2018 00:35:24 +0000 (+1000)
Subject: wafsamba: Make INSTALL_DIR() respect $DESTDIR
X-Git-Tag: tdb-1.3.17~1659
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26ea0f58daace4adef7c5bb17f19476083bf3b7b;p=thirdparty%2Fsamba.git

wafsamba: Make INSTALL_DIR() respect $DESTDIR

INSTALL_DIR() currently ignores $DESTDIR and just installs directories
into the final destination.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
---

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index d6754e9127c..93ca7ace43a 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -897,7 +897,8 @@ def INSTALL_DIR(bld, path, chmod=0o755, env=None):
     if not path:
         return []
 
-    destpath = bld.EXPAND_VARIABLES(path)
+    destpath = os.path.join(Options.options.destdir,
+                            bld.EXPAND_VARIABLES(path).lstrip(os.sep))
 
     if bld.is_install > 0:
         if not os.path.isdir(destpath):