FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix install_files in the case relative_trick=True

This commit is contained in:
Thomas Nagy 2016-05-20 19:20:54 +02:00
parent 5eaf7aee1b
commit e09a32467f
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
waflib/Build.py
View File

@ -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))