From ef6ceb83a2d90d1e96b744f9414a651f5320e63c Mon Sep 17 00:00:00 2001 From: "Igor V. Kovalenko" Date: Fri, 16 Oct 2020 00:24:50 +0300 Subject: build-sys: meson: adjust path to gsettings-helper runing from build tree --- src/modules/gsettings/module-gsettings.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/gsettings/module-gsettings.c b/src/modules/gsettings/module-gsettings.c index 209c8575..08220934 100644 --- a/src/modules/gsettings/module-gsettings.c +++ b/src/modules/gsettings/module-gsettings.c @@ -52,7 +52,11 @@ int pa__init(pa_module*m) { if ((u->fd = pa_start_child_for_read( #if defined(__linux__) && defined(HAVE_RUNNING_FROM_BUILD_TREE) +#ifdef MESON_BUILD + pa_run_from_build_tree() ? PA_BUILDDIR PA_PATH_SEP "src" PA_PATH_SEP "modules" PA_PATH_SEP "gsettings" PA_PATH_SEP "gsettings-helper" : +#else pa_run_from_build_tree() ? PA_BUILDDIR "/gsettings-helper" : +#endif #endif PA_GSETTINGS_HELPER, NULL, &u->pid)) < 0) goto fail; -- cgit v1.2.1