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/interpreter/interpreter.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/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 71299af..3e6f343 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -2419,10 +2419,15 @@ class Interpreter(InterpreterBase, HoldableObject): 'It worked by accident and is buggy. Use install_emptydir instead.', node) install_mode = self._warn_kwarg_install_mode_sticky(kwargs['install_mode']) + idir_name = kwargs['install_dir'] + if isinstance(idir_name, P_OBJ.OptionString): + idir_name = idir_name.optname + idir = build.InstallDir( self.subdir, args[0], kwargs['install_dir'], + idir_name, install_mode, exclude, kwargs['strip_directory'], |