summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJosé Expósito <jose.exposito89@gmail.com>2021-08-03 19:53:36 +0200
committerJosé Expósito <jose.exposito89@gmail.com>2021-08-03 20:00:37 +0200
commit375618b81bf04788f214a8c32f9a50538f829e75 (patch)
tree6aa890ea83cb7765a08f54b35c0fefb9e5c1f903 /doc
parent44212baaf13fb775ff656b7fd8b4353a2e072462 (diff)
downloadlibinput-375618b81bf04788f214a8c32f9a50538f829e75.tar.gz
meson.build: use the / operator instead of join_paths
Starting with meson v0.49.0, the "/" operator can be used instead of join_paths. Update meson to v0.49.0 and remove all calls to join_paths. Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/user/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/meson.build b/doc/user/meson.build
index ed4c7da8..8d2714b2 100644
--- a/doc/user/meson.build
+++ b/doc/user/meson.build
@@ -191,7 +191,7 @@ if yq.found()
foreach distro : distributions
yq_filter = '.distributions[] | select(.name == "@0@") | .packages | join(" ")'.format(distro)
deps = run_command(yq, '-r', yq_filter,
- join_paths(meson.source_root(), '.gitlab-ci', 'config.yml')).stdout()
+ meson.source_root() / '.gitlab-ci' / 'config.yml').stdout()
dependencies_config.set('@0@_PACKAGES'.format(distro.to_upper()), deps)
endforeach
endif
@@ -205,6 +205,6 @@ custom_target('sphinx',
input : [ sphinx_conf_py, git_version_page ] + src_sphinx + dst_404s,
output : [ sphinx_output_dir ],
command : [ sphinx, '-q', '-b', 'html',
- '-d', join_paths(meson.current_build_dir(), 'doctrees'),
+ '-d', meson.current_build_dir() / 'doctrees',
meson.current_build_dir(), sphinx_output_dir],
build_by_default : true)