From 233be89e9cb5f2c00e725f9dc866b83e33e11e0b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 5 Jan 2024 22:43:50 -0800 Subject: [PATCH] sage-generate-meson: Use install_subdir only when --monolithic --- src/sage_setup/autogen/meson/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sage_setup/autogen/meson/__init__.py b/src/sage_setup/autogen/meson/__init__.py index 3fd2865fd60..0c700ee7f09 100644 --- a/src/sage_setup/autogen/meson/__init__.py +++ b/src/sage_setup/autogen/meson/__init__.py @@ -79,7 +79,7 @@ def read_distribution(path): has_cython = has_cython or subdir_has_cython if not subdir_distributions: pass - elif len(subdir_distributions) > 1 or subdir_has_cython: + elif not monolithic or len(subdir_distributions) > 1 or subdir_has_cython: recurse_subdirs[subdir] = subdir_distributions else: by_distribution[list(subdir_distributions)[0]].install_subdirs.append(subdir) @@ -210,7 +210,7 @@ def get_metadata(path: Path): if cython_files: has_cython = True - if not has_cython and len(distributions) <= 1: + if monolithic and not has_cython and len(distributions) <= 1: # No need for a meson.build file try: meson_build_path.unlink()