From 47e5a3bdac80f7ae72ab9c28d8a0603a8884ef85 Mon Sep 17 00:00:00 2001 From: Anton Golubev Date: Fri, 22 Sep 2023 17:53:00 +0300 Subject: [PATCH] Use subdirs for 'py_sources_dir' too If you explicitly specify the 'py_sources_dir' option, the howdy and howdy-gtk source files get mixed up, fixed that. --- howdy-gtk/meson.build | 2 +- howdy/src/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/howdy-gtk/meson.build b/howdy-gtk/meson.build index 26b18b5..100a06c 100644 --- a/howdy-gtk/meson.build +++ b/howdy-gtk/meson.build @@ -32,7 +32,7 @@ py.dependency() if get_option('install_in_site_packages') pysourcesinstalldir = join_paths(py.get_install_dir(), 'howdy-gtk') else - pysourcesinstalldir = get_option('py_sources_dir') != '' ? get_option('py_sources_dir') : join_paths(get_option('prefix'), get_option('libdir'), 'howdy-gtk') + pysourcesinstalldir = get_option('py_sources_dir') != '' ? get_option('py_sources_dir') / 'howdy-gtk' : join_paths(get_option('prefix'), get_option('libdir'), 'howdy-gtk') endif if get_option('install_in_site_packages') diff --git a/howdy/src/meson.build b/howdy/src/meson.build index 6533951..c88a194 100644 --- a/howdy/src/meson.build +++ b/howdy/src/meson.build @@ -46,7 +46,7 @@ py_sources = [ if get_option('install_in_site_packages') pysourcesinstalldir = join_paths(py.get_install_dir(), 'howdy') else - pysourcesinstalldir = get_option('py_sources_dir') != '' ? get_option('py_sources_dir') : join_paths(get_option('prefix'), get_option('libdir'), 'howdy') + pysourcesinstalldir = get_option('py_sources_dir') != '' ? get_option('py_sources_dir') / 'howdy' : join_paths(get_option('prefix'), get_option('libdir'), 'howdy') endif pam_module_conf_data = configuration_data(paths_dict)