From 8b2d25f1e82fc602d18e9ec423c5acc018b3d864 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 21 Oct 2022 16:50:31 +0200 Subject: [PATCH] build: Replace join_paths with the / operator Since Meson 0.49.0, the / operator on strings is equivalent to calling join_paths() [1], and the former is less verbose, and easier to read. [1] https://mesonbuild.com/Reference-manual_functions.html#join_paths https://github.com/containers/toolbox/pull/1141 --- data/config/meson.build | 2 +- doc/meson.build | 2 +- meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/config/meson.build b/data/config/meson.build index a187df8..3b7d8e5 100644 --- a/data/config/meson.build +++ b/data/config/meson.build @@ -1,4 +1,4 @@ install_data( 'toolbox.conf', - install_dir: join_paths(get_option('sysconfdir'), 'containers'), + install_dir: get_option('sysconfdir') / 'containers', ) diff --git a/doc/meson.build b/doc/meson.build index 53163c6..f5b3666 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -32,7 +32,7 @@ foreach section, pages: manuals command: go_md2man_command, input: input, install: true, - install_dir: join_paths(get_option('mandir'), sectiondir), + install_dir: get_option('mandir') / sectiondir, output: output, ) endforeach diff --git a/meson.build b/meson.build index 2ecf0a0..b15480c 100644 --- a/meson.build +++ b/meson.build @@ -63,7 +63,7 @@ endif install_subdir( 'test', - install_dir: join_paths(get_option('datadir'), meson.project_name()), + install_dir: get_option('datadir') / meson.project_name(), exclude_files: [ 'system/libs/bats-assert/.git', 'system/libs/bats-assert/.gitignore',