From cb4fa024b2751054f6ea13eb911b957409cfdd31 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Thu, 6 May 2021 12:15:52 +0300
Subject: [PATCH] meson: replace join_paths() with operator /

---
 lib/wpipc/meson.build   |  2 +-
 meson.build             | 16 ++++++++--------
 src/systemd/meson.build |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/wpipc/meson.build b/lib/wpipc/meson.build
index a423ff0d..b6a0ed7b 100644
--- a/lib/wpipc/meson.build
+++ b/lib/wpipc/meson.build
@@ -24,7 +24,7 @@ wpipc_lib_headers = files(
 
 
 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,
diff --git a/meson.build b/meson.build
index 1ca08fc7..2bfb5761 100644
--- a/meson.build
+++ b/meson.build
@@ -11,30 +11,30 @@ project('wireplumber', ['c'],
 wireplumber_api_version = '0.4'
 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('/')
   wireplumber_bin_dir = get_option('bindir')
 else
-  wireplumber_bin_dir = join_paths(get_option('prefix'), get_option('bindir'))
+  wireplumber_bin_dir = get_option('prefix') / get_option('bindir')
 endif
 
 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
-  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
 
 if get_option('sysconfdir').startswith('/')
-  wireplumber_config_dir = join_paths(get_option('sysconfdir'), 'wireplumber')
+  wireplumber_config_dir = get_option('sysconfdir') / 'wireplumber'
 else
-  wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber')
+  wireplumber_config_dir = get_option('prefix') / get_option('sysconfdir') / 'wireplumber'
 endif
 
 if get_option('datadir').startswith('/')
-  wireplumber_data_dir = join_paths(get_option('datadir'), 'wireplumber')
+  wireplumber_data_dir = get_option('datadir') / 'wireplumber'
 else
-  wireplumber_data_dir = join_paths(get_option('prefix'), get_option('datadir'), 'wireplumber')
+  wireplumber_data_dir = get_option('prefix') / get_option('datadir') / 'wireplumber'
 endif
 
 cc = meson.get_compiler('c')
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index dc5decd9..d57152e8 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -2,7 +2,7 @@ systemd = dependency('systemd', required: get_option('systemd'))
 
 if systemd.found()
   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)
 
   # system service