From 26ea0f58daace4adef7c5bb17f19476083bf3b7b Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 10 Sep 2018 10:35:24 +1000 Subject: [PATCH] wafsamba: Make INSTALL_DIR() respect $DESTDIR INSTALL_DIR() currently ignores $DESTDIR and just installs directories into the final destination. Signed-off-by: Martin Schwenke Reviewed-by: Alexander Bokovoy --- buildtools/wafsamba/wafsamba.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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): -- 2.47.2