fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2025-12-24 23:40:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: replace join_paths() with operator /

Browse source
This commit is contained in:
George Kiagiadakis 2021-05-06 12:15:52 +03:00
parent d4b230b994
commit cb4fa024b2
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/wpipc/meson.build
View file

@ -24,7 +24,7 @@ wpipc_lib_headers = files(
install_headers(wpipc_lib_headers, install_headers(wpipc_lib_headers,
install_dir : join_paths(get_option('includedir'), 'wpipc-' + wireplumber_api_version, 'wpipc') install_dir : get_option('includedir') / 'wpipc-' + wireplumber_api_version / 'wpipc'
) )
wpipc_lib = library('wpipc-' + wireplumber_api_version, wpipc_lib = library('wpipc-' + wireplumber_api_version,

16
meson.build
View file

@ -11,30 +11,30 @@ project('wireplumber', ['c'],
wireplumber_api_version = '0.4' wireplumber_api_version = '0.4'
wireplumber_so_version = '0' wireplumber_so_version = '0'
wireplumber_headers_dir = join_paths(get_option('includedir'), 'wireplumber-' + wireplumber_api_version, 'wp') wireplumber_headers_dir = get_option('includedir') / 'wireplumber-' + wireplumber_api_version / 'wp'
if get_option('bindir').startswith('/') if get_option('bindir').startswith('/')
wireplumber_bin_dir = get_option('bindir') wireplumber_bin_dir = get_option('bindir')
else else
wireplumber_bin_dir = join_paths(get_option('prefix'), get_option('bindir')) wireplumber_bin_dir = get_option('prefix') / get_option('bindir')
endif endif
if get_option('libdir').startswith('/') if get_option('libdir').startswith('/')
wireplumber_module_dir = join_paths(get_option('libdir'), 'wireplumber-' + wireplumber_api_version) wireplumber_module_dir = get_option('libdir') / 'wireplumber-' + wireplumber_api_version
else else
wireplumber_module_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wireplumber-' + wireplumber_api_version) wireplumber_module_dir = get_option('prefix') / get_option('libdir') / 'wireplumber-' + wireplumber_api_version
endif endif
if get_option('sysconfdir').startswith('/') if get_option('sysconfdir').startswith('/')
wireplumber_config_dir = join_paths(get_option('sysconfdir'), 'wireplumber') wireplumber_config_dir = get_option('sysconfdir') / 'wireplumber'
else else
wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber') wireplumber_config_dir = get_option('prefix') / get_option('sysconfdir') / 'wireplumber'
endif endif
if get_option('datadir').startswith('/') if get_option('datadir').startswith('/')
wireplumber_data_dir = join_paths(get_option('datadir'), 'wireplumber') wireplumber_data_dir = get_option('datadir') / 'wireplumber'
else else
wireplumber_data_dir = join_paths(get_option('prefix'), get_option('datadir'), 'wireplumber') wireplumber_data_dir = get_option('prefix') / get_option('datadir') / 'wireplumber'
endif endif
cc = meson.get_compiler('c') cc = meson.get_compiler('c')

2
src/systemd/meson.build
View file

@ -2,7 +2,7 @@ systemd = dependency('systemd', required: get_option('systemd'))
if systemd.found() if systemd.found()
systemd_config = configuration_data() systemd_config = configuration_data()
systemd_config.set('WP_BINARY', join_paths(wireplumber_bin_dir, 'wireplumber')) systemd_config.set('WP_BINARY', wireplumber_bin_dir / 'wireplumber')
systemd_config.set('WP_CONFIG_DIR', wireplumber_config_dir) systemd_config.set('WP_CONFIG_DIR', wireplumber_config_dir)
# system service # system service