From 9321e6238338afbecc6e987a727450970f9403d8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Tue, 21 Jul 2020 10:20:03 +0100
Subject: [PATCH] meson: use / instead of join_paths() for readability

---
 doc/meson.build                 | 2 +-
 meson.build                     | 8 ++++----
 testsuite/benchmorc/meson.build | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/meson.build b/doc/meson.build
index 7e2b700..5306ad1 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -29,6 +29,6 @@ endif
 # FIXME: there should be a way to specify the gtk-doc requirement
 # html_args : '--path=' + meson.current_build_dir() + ':' + meson.current_source_dir(),
 gnome.gtkdoc('orc',
-  src_dir : join_paths(meson.current_source_dir(), '..', 'orc'),
+  src_dir : meson.current_source_dir() / '..' / 'orc',
   main_sgml : 'orc-docs.sgml',
   install : true)
diff --git a/meson.build b/meson.build
index eeb3f17..84af0a0 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project ('orc', 'c', version : '0.4.31',
-                     meson_version : '>= 0.47.0',
+                     meson_version : '>= 0.49.0',
                      default_options : ['buildtype=debugoptimized',
                                         'warning_level=1',
                                         'c_std=gnu99'] )
@@ -192,13 +192,13 @@ endif
 # FIXME: use pkg-config module
 pc_conf.set('prefix', get_option('prefix'))
 pc_conf.set('exec_prefix', get_option('prefix'))
-pc_conf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-pc_conf.set('includedir', join_paths(get_option('prefix'), 'include'))
+pc_conf.set('libdir', get_option('prefix') / get_option('libdir'))
+pc_conf.set('includedir', get_option('prefix') / 'include')
 pc_conf.set('VERSION', meson.project_version())
 pc_conf.set('ORC_MAJORMINOR', orc_api)
 pc_conf.set('LIBM', libm.found() ? '-lm' : '')
 
-pkgconfigdir = join_paths (get_option('libdir'), 'pkgconfig')
+pkgconfigdir = get_option('libdir') / 'pkgconfig'
 configure_file(input : 'orc.pc.in',
   output : 'orc-' + orc_api + '.pc',
   configuration : pc_conf,
diff --git a/testsuite/benchmorc/meson.build b/testsuite/benchmorc/meson.build
index 7474fa1..2fee43e 100644
--- a/testsuite/benchmorc/meson.build
+++ b/testsuite/benchmorc/meson.build
@@ -1,4 +1,4 @@
-bench10_orc_path = join_paths(meson.current_source_dir(), 'bench10.orc')
+bench10_orc_path = meson.current_source_dir() / 'bench10.orc'
 
 exe = executable ('benchmorc', 'benchmorc.c',
             c_args : ['-DORC_TEST_FILENAME="' + bench10_orc_path + '"'],
-- 
2.7.4