meson: use a / b instead of join_paths(a, b)

According to [1], since meson 0.49.0, using the / operator on strings
is equivalent to calling join_paths().

As the expressions written using the / operator are shorter and nicer
than their equivalents written using join_paths(), and given that
we've been using this new operator since commit
5f2c862a4aff19f5bc732e677405f04e2d07c211, let's convert remaining
join_paths() invocations to use the / operator instead.

[1] https://mesonbuild.com/Reference-manual_functions.html#join_paths

diff --git a/libblkid/meson.build b/libblkid/meson.build
index 73ea0883d28aefaa87516923066a91297ff6d07c..82538e135256754993a181a9764e15205fb7039e 100644 (file)
--- a/libblkid/meson.build
+++ b/libblkid/meson.build
@@ -14,7 +14,7 @@ configure_file(
   output : 'blkid.h',
   configuration : defs,
   install : build_libblkid,
-  install_dir : join_paths(get_option('includedir'), 'blkid'),
+  install_dir : get_option('includedir') / 'blkid',
 )
 
 lib_blkid_sources = '''

diff --git a/libfdisk/meson.build b/libfdisk/meson.build
index 57dda5cfa9906f3022f89a65cf53d911390af7ab..58b2222e5d381f2f85a9f6a61bff8805be8c3979 100644 (file)
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -11,7 +11,7 @@ configure_file(
   output : 'libfdisk.h',
   configuration : defs,
   install : build_libfdisk,
-  install_dir : join_paths(get_option('includedir'), 'libfdisk'),
+  install_dir : get_option('includedir') / 'libfdisk',
 )
 
 lib_fdisk_sources = '''

diff --git a/libmount/meson.build b/libmount/meson.build
index 6b16aab94dc036a06a4716d71af7ab0487bacfe1..a7145c5b454bc211dbd447e596784655ff2a34cb 100644 (file)
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -17,7 +17,7 @@ configure_file(
   output : 'libmount.h',
   configuration : defs,
   install : build_libmount,
-  install_dir : join_paths(get_option('includedir'), 'libmount'),
+  install_dir : get_option('includedir') / 'libmount',
 )
 
 lib_mount_sources = '''

diff --git a/libsmartcols/meson.build b/libsmartcols/meson.build
index bedd6da9769fbb510f4a8c273dae99639227ed92..ad63a1ceea7d373a796dea5f380ac6b2989aead2 100644 (file)
--- a/libsmartcols/meson.build
+++ b/libsmartcols/meson.build
@@ -8,7 +8,7 @@ configure_file(
   output : 'libsmartcols.h',
   configuration : defs,
   install : build_libsmartcols,
-  install_dir : join_paths(get_option('includedir'), 'libsmartcols'),
+  install_dir : get_option('includedir') / 'libsmartcols',
 )
 
 scols_bison = generator(

diff --git a/meson.build b/meson.build
index 877bb8b3f6ed1d7dab59844f92a82b75f8be7603..d98a3a0dcb3c91a469d27b695b7534088b46e896 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -24,17 +24,17 @@ prefixdir = get_option('prefix')
 if not fs.is_absolute(prefixdir)
         error('Prefix is not absolute: "@0@"'.format(prefixdir))
 endif
-bindir = join_paths(prefixdir, get_option('bindir'))
-sbindir = join_paths(prefixdir, get_option('sbindir'))
-sysconfstaticdir = join_paths(prefixdir, 'lib')
-docdir = join_paths(prefixdir, get_option('datadir'), 'doc', 'util-linux')
-mandir = join_paths(prefixdir, get_option('mandir'))
+bindir = prefixdir / get_option('bindir')
+sbindir = prefixdir / get_option('sbindir')
+sysconfstaticdir = prefixdir / 'lib'
+docdir = prefixdir / get_option('datadir') / 'doc' / 'util-linux'
+mandir = prefixdir / get_option('mandir')
 runstatedir = '/run'
 localstatedir = '/var'
 execprefixdir = prefixdir
-sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
-usrbin_exec_dir = join_paths(execprefixdir, bindir)
-usrsbin_exec_dir = join_paths(execprefixdir, sbindir)
+sysconfdir = prefixdir / get_option('sysconfdir')
+usrbin_exec_dir = execprefixdir / bindir
+usrsbin_exec_dir = execprefixdir / sbindir
 bash_completion = dependency('bash-completion', required : get_option('build-bash-completion'))
 
 vendordir = get_option('vendordir')
@@ -1053,7 +1053,7 @@ if opt and not is_disabler(exe)
   exes += exe
   meson.add_install_script(meson_make_symlink,
                            'last',
-                           join_paths(usrbin_exec_dir, 'lastb'))
+                           usrbin_exec_dir / 'lastb')
   manadocs += ['login-utils/last.1.adoc']
   manlinks += {'lastb.1': 'last.1'}
   bashcompletions += ['last']
@@ -1164,11 +1164,11 @@ if opt and not is_disabler(exe)
   exes += exe
   meson.add_install_script(meson_make_symlink,
                            'vipw',
-                           join_paths(usrbin_exec_dir, 'vigr'))
+                           usrbin_exec_dir / 'vigr')
   manadocs += ['login-utils/vipw.8.adoc']
   meson.add_install_script(meson_make_symlink,
                            'vipw.8',
-                           join_paths(mandir, 'man8/vigr.8'))
+                           mandir / 'man8/vigr.8')
 endif
 
 opt = get_option('build-runuser').require(have_pty).allowed()
@@ -1720,7 +1720,7 @@ if opt
   foreach link: setarch_links
     meson.add_install_script(meson_make_symlink,
                             'setarch',
-                            join_paths(usrbin_exec_dir, link))
+                            usrbin_exec_dir / link)
     manlinks += {link + '.8': 'setarch.8'}
   endforeach
 endif
@@ -3912,7 +3912,7 @@ if asciidoctor.found()
     name = adoc.split('/')[-1]
     page = name.split('.adoc')[0]
     section = page.split('.')[-1]
-    mandirn = join_paths(mandir, 'man' + section)
+    mandirn = mandir / 'man' + section
     input = adoc
 
     custom_target(
@@ -3939,21 +3939,21 @@ if asciidoctor.found()
     link_section = link_name.split('.')[-1]
     target_section = target.split('.')[-1]
     meson.add_install_script(meson_make_manpage_stub,
-      join_paths('man' + target_section, target),
-      join_paths(mandir, 'man' + link_section, link_name))
+      'man' + target_section / target,
+      mandir / 'man' + link_section / link_name)
   endforeach
 endif
 
 if bash_completion.found()
   foreach completion : bashcompletions
     install_data(
-      join_paths('bash-completion', completion),
+      'bash-completion' / completion,
       install_dir : bash_completion.get_variable(pkgconfig : 'completionsdir')
     )
   endforeach
   foreach link_name, target : bashcompletionslinks
     meson.add_install_script(meson_make_symlink,
       target,
-      join_paths(bash_completion.get_variable(pkgconfig : 'completionsdir'), link_name))
+      bash_completion.get_variable(pkgconfig : 'completionsdir') / link_name)
   endforeach
 endif