diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-15 19:13:21 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-15 19:13:21 +0200 |
| commit | 99bb73e6c96655fe335dbeca6ae2f8dc7986d213 (patch) | |
| tree | 76a40ac85b13a3a7be14a65202c1ffd9d8ad5faf /ninjabackend.py | |
| parent | 7c074fd9535e8dbe2f32a5b322ce8e25b27cce8a (diff) | |
| download | meson-99bb73e6c96655fe335dbeca6ae2f8dc7986d213.zip meson-99bb73e6c96655fe335dbeca6ae2f8dc7986d213.tar.gz meson-99bb73e6c96655fe335dbeca6ae2f8dc7986d213.tar.bz2 | |
Changed install_data to get rid of useless and confusing target subdir name.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index fb7dfae..96e49d2 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -462,9 +462,7 @@ class NinjaBackend(backends.Backend): dataroot = self.environment.get_datadir() data = self.build.get_data() for de in data: - subdir = de.get_custom_install_dir() - if subdir is None: - subdir = os.path.join(dataroot, de.get_install_subdir()) + subdir = de.get_install_dir() for f in de.get_sources(): srcabs = os.path.join(self.environment.get_source_dir(), de.get_source_subdir(), f) dstabs = os.path.join(subdir, f) |