diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-08-13 21:47:23 +0200 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-08-13 22:10:44 +0200 |
| commit | 728a4402eb85983eb9ad160470e79c57201b572a (patch) | |
| tree | d0cbfc1368a226e05eb57c281db6653fc0a4206d | |
| parent | 57c9bf7902dab231981f5b08a730bc89aa04e284 (diff) | |
| download | pulseaudio-728a4402eb85983eb9ad160470e79c57201b572a.tar.gz | |
build-sys: meson: Fix 2 cases of joining paths w/o join_paths
Fixes https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/712
| -rw-r--r-- | src/modules/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/meson.build b/src/modules/meson.build index 7192c1b4..5be90f2d 100644 --- a/src/modules/meson.build +++ b/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 |