diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-02-12 22:50:45 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-02-12 22:50:45 +0200 |
| commit | eb51163185fdeaf50646d0ae2876c94c230fa61a (patch) | |
| tree | cd2065edcb904cfd116226e9f3bc439416139419 /backends.py | |
| parent | 51827d4484845432588f850b24245d22b1d9c9f0 (diff) | |
| download | meson-eb51163185fdeaf50646d0ae2876c94c230fa61a.zip meson-eb51163185fdeaf50646d0ae2876c94c230fa61a.tar.gz meson-eb51163185fdeaf50646d0ae2876c94c230fa61a.tar.bz2 | |
Fix the remaining custom install dirs.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/backends.py b/backends.py index 6a1109b..e4aaced 100644 --- a/backends.py +++ b/backends.py @@ -587,10 +587,11 @@ class NinjaBackend(Backend): for m in man: for f in m.get_sources(): num = f.split('.')[-1] - subdir = 'man' + num + subdir = m.get_custom_install_dir() + if subdir is None: + subdir = os.path.join(manroot, 'man' + num) srcabs = os.path.join(self.environment.get_source_dir(), f) - dstabs = os.path.join(manroot, - os.path.join(subdir, f + '.gz')) + dstabs = os.path.join(subdir, f + '.gz') i = [srcabs, dstabs] d.man.append(i) @@ -598,7 +599,9 @@ class NinjaBackend(Backend): dataroot = self.environment.get_datadir() data = self.build.get_data() for de in data: - subdir = os.path.join(dataroot, de.get_subdir()) + subdir = de.get_custom_install_dir() + if subdir is None: + subdir = os.path.join(dataroot, de.get_subdir()) for f in de.get_sources(): srcabs = os.path.join(self.environment.get_source_dir(), f) dstabs = os.path.join(subdir, f) |