diff options
| author | Daniele Nicolodi <daniele@grinta.net> | 2023-06-26 16:24:53 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-07-26 13:30:49 -0400 |
| commit | 9eb7fe332f6a6a8babd040b76ad2a6808faf0423 (patch) | |
| tree | c52b1c241f7f77e2e2beee8281c50ec39e32c569 /mesonbuild/modules/python.py | |
| parent | a0f165b2fa57653a44c97398c00c453ec28e6dcc (diff) | |
| download | meson-9eb7fe332f6a6a8babd040b76ad2a6808faf0423.tar.gz | |
Fix install_data() default install path
This fixes two issues in constructing the default installation path
when install_dir is not specified:
- inside a subproject, install_data() would construct the destination
path using the parent project name instead than the current project
name,
- when specifying preserve_path, install_data() would construct the
destination path omitting the project name.
Fixes #11910.
Diffstat (limited to 'mesonbuild/modules/python.py')
| -rw-r--r-- | mesonbuild/modules/python.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index f6c82e0d6..75b291f02 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -224,7 +224,6 @@ class PythonInstallation(ExternalProgramHolder): self.interpreter.source_strings_to_files(args[0]), install_dir, mesonlib.FileMode(), rename=None, tag=tag, install_data_type='python', - install_dir_name=install_dir.optname, preserve_path=kwargs['preserve_path']) @noPosargs |