diff options
| author | Aleksey Filippov <alekseyf@google.com> | 2018-01-18 16:44:06 +0000 |
|---|---|---|
| committer | Aleksey Filippov <alekseyf@google.com> | 2018-02-05 01:28:07 +0000 |
| commit | 8ca3cc0c3db481b467233151e481a190cbb84c31 (patch) | |
| tree | e3f247cfdaa3db28ef073d5f6513fbae1da2fb80 /mesonbuild/backend/ninjabackend.py | |
| parent | 86ee89b400fc4acbb506cc44d5a287958397edf9 (diff) | |
| download | meson-8ca3cc0c3db481b467233151e481a190cbb84c31.zip meson-8ca3cc0c3db481b467233151e481a190cbb84c31.tar.gz meson-8ca3cc0c3db481b467233151e481a190cbb84c31.tar.bz2 | |
Add elide_directory keyword for install_subdir() function
If elide_directory=true install_subdir() installs directory contents
instead of directory itself, eliding name of the source directory.
Closes #2869.
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..ba33012 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.elide_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]) |