diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-03 18:37:23 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-03 18:37:23 +0200 |
| commit | a500c6cfa885ab9da7527d6f983f162f31e47710 (patch) | |
| tree | f8044d17e42f53d5da52d9470fe9432f5f8132d2 /ninjabackend.py | |
| parent | d767bcf86db95d5d9f17306b3c17d56f93b0e873 (diff) | |
| download | meson-a500c6cfa885ab9da7527d6f983f162f31e47710.zip meson-a500c6cfa885ab9da7527d6f983f162f31e47710.tar.gz meson-a500c6cfa885ab9da7527d6f983f162f31e47710.tar.bz2 | |
Can install data files from subdirectories.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 178e371..398b0ef 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -459,9 +459,9 @@ class NinjaBackend(backends.Backend): for de in data: subdir = de.get_custom_install_dir() if subdir is None: - subdir = os.path.join(dataroot, de.get_subdir()) + subdir = os.path.join(dataroot, de.get_install_subdir()) for f in de.get_sources(): - srcabs = os.path.join(self.environment.get_source_dir(), f) + srcabs = os.path.join(self.environment.get_source_dir(), de.get_source_subdir(), f) dstabs = os.path.join(subdir, f) i = [srcabs, dstabs] d.data.append(i) |