[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] build-sys: meson: adjust path to gsettings-helper runing from build tree

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
ef6ceb83 by Igor V. Kovalenko at 2020-10-20T15:24:52-04:00
build-sys: meson: adjust path to gsettings-helper runing from build tree

- - - - -


1 changed file:

- src/modules/gsettings/module-gsettings.c


Changes:

=====================================
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;



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ef6ceb83a2d90d1e96b744f9414a651f5320e63c

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ef6ceb83a2d90d1e96b744f9414a651f5320e63c
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20201020/e72b2326/attachment.htm>