summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor V. Kovalenko <igor.v.kovalenko@gmail.com>2020-10-16 00:24:50 +0300
committerArun Raghavan <arun@asymptotic.io>2020-10-20 15:24:52 -0400
commitef6ceb83a2d90d1e96b744f9414a651f5320e63c (patch)
treee5abdc787e55291370a547a6c5a12a32a6215b51
parent40bb058a31bcdb9a1e44586a560aaf90aecafc74 (diff)
build-sys: meson: adjust path to gsettings-helper runing from build tree
-rw-r--r--src/modules/gsettings/module-gsettings.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/gsettings/module-gsettings.c b/src/modules/gsettings/module-gsettings.c
index 209c8575b..08220934d 100644
--- a/src/modules/gsettings/module-gsettings.c
+++ b/src/modules/gsettings/module-gsettings.c
@@ -52,8 +52,12 @@ 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;