diff options
| author | Thomas Li <47963215+lithomas1@users.noreply.github.com> | 2022-09-02 15:43:11 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-09-06 02:09:38 -0400 |
| commit | a4d54422077a6fb7fe7af072e0563b58e602d4ae (patch) | |
| tree | f99dee3e1aa8dd685518e848362d43da386745bb /mesonbuild/backend/backends.py | |
| parent | e6122ba7864cf7b4c20091651e69d33ba2f7b463 (diff) | |
| download | meson-a4d54422077a6fb7fe7af072e0563b58e602d4ae.zip meson-a4d54422077a6fb7fe7af072e0563b58e602d4ae.tar.gz meson-a4d54422077a6fb7fe7af072e0563b58e602d4ae.tar.bz2 | |
Fix install_subdirs not showing up in intro-install_plan.json
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 63b8731..304bea3 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1754,9 +1754,11 @@ class Backend: dst_dir = os.path.join(self.environment.get_prefix(), sd.install_dir) dst_name = os.path.join('{prefix}', sd.install_dir) + if sd.install_dir != sd.install_dir_name: + dst_name = sd.install_dir_name if not sd.strip_directory: dst_dir = os.path.join(dst_dir, os.path.basename(src_dir)) - dst_name = os.path.join(dst_dir, os.path.basename(src_dir)) + dst_name = os.path.join(dst_name, os.path.basename(src_dir)) i = SubdirInstallData(src_dir, dst_dir, dst_name, sd.install_mode, sd.exclude, sd.subproject, sd.install_tag) d.install_subdirs.append(i) |