From e09a32467f533351be520dc9a2e7a91602af6648 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Fri, 20 May 2016 19:20:54 +0200 Subject: [PATCH] Fix install_files in the case relative_trick=True --- waflib/Build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/waflib/Build.py b/waflib/Build.py index 52adf073..923a312e 100644 --- a/waflib/Build.py +++ b/waflib/Build.py @@ -911,6 +911,7 @@ def add_install_task(self, **kw): tsk.type = kw['type'] tsk.install_to = tsk.dest = kw['install_to'] tsk.install_from = kw['install_from'] + tsk.relative_base = kw.get('cwd') or kw.get('relative_base', self.path) tsk.init_files() if not kw.get('postpone', True): tsk.run_now() @@ -960,7 +961,7 @@ class inst(Task.Task): else: for y in inputs: if self.relative_trick: - destfile = os.path.join(dest, y.path_from(self.generator.path)) + destfile = os.path.join(dest, y.path_from(self.relative_base)) else: destfile = os.path.join(dest, y.name) outputs.append(self.generator.bld.root.make_node(destfile))