diff --git a/meson.build b/meson.build index cd1dff89f..fe87c8e5b 100644 --- a/meson.build +++ b/meson.build @@ -35,13 +35,15 @@ if not prefix.startswith('/') error('Prefix is not absolute: "@0@"'.format(prefix)) endif +bindir = join_paths(prefix, get_option('bindir')) +libdir = join_paths(prefix, get_option('libdir')) datadir = join_paths(prefix, get_option('datadir')) localstatedir = join_paths(prefix, get_option('localstatedir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) pulsedspdir = get_option('pulsedspdir') if pulsedspdir == '' - join_paths(prefix, get_option('libdir'), 'pulseaudio') + join_paths(libdir, 'pulseaudio') endif cc = meson.get_compiler('c') @@ -61,11 +63,11 @@ cdata.set_quoted('PA_SRCDIR', join_paths(meson.current_source_dir(), 'src')) cdata.set_quoted('PA_BUILDDIR', meson.current_build_dir()) cdata.set_quoted('PA_SOEXT', '.so') cdata.set_quoted('PA_DEFAULT_CONFIG_DIR', join_paths(sysconfdir, 'pulse')) -cdata.set_quoted('PA_BINARY', join_paths(prefix, get_option('bindir'), 'pulseaudio')) +cdata.set_quoted('PA_BINARY', join_paths(bindir, 'pulseaudio')) cdata.set_quoted('PA_SYSTEM_RUNTIME_PATH', join_paths(localstatedir, 'run', 'pulse')) cdata.set_quoted('PA_SYSTEM_CONFIG_PATH', join_paths(localstatedir, 'lib', 'pulse')) cdata.set_quoted('PA_SYSTEM_STATE_PATH', join_paths(localstatedir, 'lib', 'pulse')) -cdata.set_quoted('PA_DLSEARCHPATH', join_paths(prefix, get_option('libdir'), 'pulse-' + pa_version_major_minor, 'modules')) +cdata.set_quoted('PA_DLSEARCHPATH', join_paths(libdir, 'pulse-' + pa_version_major_minor, 'modules')) cdata.set_quoted('PA_SYSTEM_USER', get_option('system_user')) cdata.set_quoted('PA_SYSTEM_GROUP', get_option('system_group')) cdata.set_quoted('PA_ACCESS_GROUP', get_option('access_group')) diff --git a/src/modules/meson.build b/src/modules/meson.build index 683b42f56..b951e2374 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -35,7 +35,7 @@ all_modules = [ [ 'module-http-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_HTTP', '-DUSE_UNIX_SOCKETS'], [], libprotocol_http ], [ 'module-intended-roles', 'module-intended-roles.c' ], [ 'module-jackdbus-detect', 'jack/module-jackdbus-detect.c', [], [], [dbus_dep] ], - [ 'module-ladspa-sink', 'module-ladspa-sink.c', 'ladspa.h', ['-DLADSPA_PATH="' + join_paths(prefix, get_option('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="' + 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 ], diff --git a/src/utils/meson.build b/src/utils/meson.build index e0ddf8d68..7f129c1e6 100644 --- a/src/utils/meson.build +++ b/src/utils/meson.build @@ -82,6 +82,6 @@ if cc.has_header('sys/soundcard.h') output : 'padsp', configuration : cdata, install : true, - install_dir : join_paths(prefix, get_option('bindir')), + install_dir : bindir, ) endif