From 9eb7fe332f6a6a8babd040b76ad2a6808faf0423 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Mon, 26 Jun 2023 16:24:53 +0200 Subject: 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. --- mesonbuild/modules/python.py | 1 - 1 file changed, 1 deletion(-) (limited to 'mesonbuild/modules/python.py') 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 -- cgit v1.2.3