aboutsummaryrefslogtreecommitdiff
path: root/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-11-03 18:23:29 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-11-03 18:23:29 +0200
commit8313c4ed00499cc777f84609bb4916f9cf5142b6 (patch)
treefc2a2c7a56ba8b7785b141a4542cb70904bec3d4 /ninjabackend.py
parent10313fa3ebe72c92db0b4c84c79d83a838e8f99e (diff)
downloadmeson-8313c4ed00499cc777f84609bb4916f9cf5142b6.zip
meson-8313c4ed00499cc777f84609bb4916f9cf5142b6.tar.gz
meson-8313c4ed00499cc777f84609bb4916f9cf5142b6.tar.bz2
Use correct path when installing headers. Fixes #16.
Diffstat (limited to 'ninjabackend.py')
-rw-r--r--ninjabackend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py
index 0918d7e..35734c3 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -433,9 +433,9 @@ class NinjaBackend(backends.Backend):
for h in headers:
outdir = h.get_custom_install_dir()
if outdir is None:
- outdir = os.path.join(incroot, h.get_subdir())
+ outdir = os.path.join(incroot, h.get_install_subdir())
for f in h.get_sources():
- abspath = os.path.join(self.environment.get_source_dir(), f) # FIXME
+ abspath = os.path.join(self.environment.get_source_dir(), h.get_source_subdir(), f)
i = [abspath, outdir]
d.headers.append(i)