diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-09-10 10:35:24 +1000 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2018-09-11 06:59:11 +0200 |
| commit | 26ea0f58daace4adef7c5bb17f19476083bf3b7b (patch) | |
| tree | ff37b8d9c9472faf9a392d0e9c73328aad381ff4 /buildtools | |
| parent | a122428a585281ebaf0135f11bd9377af9f6ab97 (diff) | |
| download | samba-26ea0f58daace4adef7c5bb17f19476083bf3b7b.tar.gz | |
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>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 3 |
1 files changed, 2 insertions, 1 deletions
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): |