diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-04-01 21:31:42 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-09-13 13:54:47 -0400 |
| commit | 19696c3dcdb379f4c5b88457f43242f2d33427a0 (patch) | |
| tree | 25720654b02903d45c02f976f0505d31ae197e9f /mesonbuild/backend | |
| parent | 7fbdf38ce3b02cc775ce22c3c303ad3529a758c2 (diff) | |
| download | meson-19696c3dcdb379f4c5b88457f43242f2d33427a0.zip meson-19696c3dcdb379f4c5b88457f43242f2d33427a0.tar.gz meson-19696c3dcdb379f4c5b88457f43242f2d33427a0.tar.bz2 | |
Allow installing dir from build dir
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index df6dc8f..9bb1a9a 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1335,7 +1335,11 @@ class Backend: def generate_subdir_install(self, d): for sd in self.build.get_install_subdirs(): - src_dir = os.path.join(self.environment.get_source_dir(), + if sd.from_source_dir: + from_dir = self.environment.get_source_dir() + else: + from_dir = self.environment.get_build_dir() + src_dir = os.path.join(from_dir, sd.source_subdir, sd.installable_subdir).rstrip('/') dst_dir = os.path.join(self.environment.get_prefix(), |