diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-02-05 22:34:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 22:34:09 +0200 |
| commit | 66b14e20cc3a900a1bc15bc2bb1631a3f98a28c5 (patch) | |
| tree | a3b5a66db6b18fae34857c003ff473bdff67f8d3 /mesonbuild/backend/ninjabackend.py | |
| parent | a288b524bc16eeba048e2ee8ec310422ecb36956 (diff) | |
| parent | f5917d261cb8ca60b8e2988b4c1350a8d955f190 (diff) | |
| download | meson-66b14e20cc3a900a1bc15bc2bb1631a3f98a28c5.zip meson-66b14e20cc3a900a1bc15bc2bb1631a3f98a28c5.tar.gz meson-66b14e20cc3a900a1bc15bc2bb1631a3f98a28c5.tar.bz2 | |
Merge pull request #3010 from sarum9in/elide_directory
Add strip_directory keyword for install_subdir() function
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 35e697c..6ab67fb 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -851,8 +851,9 @@ int dummy; sd.source_subdir, sd.installable_subdir).rstrip('/') dst_dir = os.path.join(self.environment.get_prefix(), - sd.install_dir, - os.path.basename(src_dir)) + sd.install_dir) + if not sd.strip_directory: + dst_dir = os.path.join(dst_dir, os.path.basename(src_dir)) d.install_subdirs.append([src_dir, dst_dir, sd.install_mode, sd.exclude]) |