mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
build-sys: meson: adjust path to gsettings-helper runing from build tree
This commit is contained in:
parent
40bb058a31
commit
ef6ceb83a2
1 changed files with 4 additions and 0 deletions
|
|
@ -52,7 +52,11 @@ int pa__init(pa_module*m) {
|
||||||
|
|
||||||
if ((u->fd = pa_start_child_for_read(
|
if ((u->fd = pa_start_child_for_read(
|
||||||
#if defined(__linux__) && defined(HAVE_RUNNING_FROM_BUILD_TREE)
|
#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" :
|
pa_run_from_build_tree() ? PA_BUILDDIR "/gsettings-helper" :
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
PA_GSETTINGS_HELPER, NULL, &u->pid)) < 0)
|
PA_GSETTINGS_HELPER, NULL, &u->pid)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue