[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] build-sys: meson: Fix 2 cases of joining paths w/o join_paths

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
728a4402 by Jan Alexander Steffens (heftig) at 2019-08-13T20:10:44Z
build-sys: meson: Fix 2 cases of joining paths w/o join_paths

Fixes https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/712

- - - - -


1 changed file:

- src/modules/meson.build


Changes:

=====================================
src/modules/meson.build
=====================================
@@ -30,7 +30,7 @@ all_modules = [
   [ 'module-http-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_HTTP', '-DUSE_TCP_SOCKETS'], [], libprotocol_http ],
   [ 'module-http-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_HTTP', '-DUSE_UNIX_SOCKETS'], [], libprotocol_http ],
   [ 'module-intended-roles', 'module-intended-roles.c' ],
-  [ 'module-ladspa-sink', 'module-ladspa-sink.c', 'ladspa.h', ['-DLADSPA_PATH="' + libdir + '/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa"'], [dbus_dep, libm_dep, ltdl_dep] ],
+  [ 'module-ladspa-sink', 'module-ladspa-sink.c', 'ladspa.h', ['-DLADSPA_PATH="' + join_paths(libdir, 'ladspa') + ':/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa"'], [dbus_dep, libm_dep, ltdl_dep] ],
   [ 'module-loopback', 'module-loopback.c' ],
   [ 'module-match', 'module-match.c' ],
   [ 'module-native-protocol-fd', 'module-native-protocol-fd.c', [], [], [], libprotocol_native ],
@@ -143,7 +143,7 @@ if gio_dep.found()
   all_modules += [
     [ 'module-gsettings',
       [ 'gsettings/module-gsettings.c', 'stdin-util.c', 'stdin-util.h' ],
-      [], ['-DPA_GSETTINGS_HELPER="' + pulselibexecdir + 'gsettings-helper"'] ]
+      [], ['-DPA_GSETTINGS_HELPER="' + join_paths(pulselibexecdir, 'gsettings-helper') + '"'] ]
   ]
 endif
 



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/728a4402eb85983eb9ad160470e79c57201b572a

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/728a4402eb85983eb9ad160470e79c57201b572a
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/20190814/1f782a1f/attachment-0001.html>