diff --git a/compositor/meson.build b/compositor/meson.build index cf09150e..7b49c485 100644 --- a/compositor/meson.build +++ b/compositor/meson.build @@ -64,7 +64,7 @@ pkgconfig.generate( install_data( 'weston.desktop', - install_dir: join_paths(dir_data, 'wayland-sessions') + install_dir: dir_data / 'wayland-sessions' ) if get_option('screenshare') diff --git a/data/meson.build b/data/meson.build index 16f172fe..10d820cb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -25,5 +25,5 @@ install_data( 'wayland.png', 'wayland.svg', ], - install_dir: join_paths(dir_data, 'weston') + install_dir: dir_data / 'weston' ) diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build index 4ee60b30..27fa7c0b 100644 --- a/doc/sphinx/meson.build +++ b/doc/sphinx/meson.build @@ -89,7 +89,7 @@ docs = run_target( install_subdir( sphinx_doc.full_path(), - install_dir: join_paths(dir_data, 'doc', 'weston'), + install_dir: dir_data / 'doc' / 'weston', exclude_files: '.buildinfo', strip_directory: true, ) diff --git a/libweston/meson.build b/libweston/meson.build index cb06c1c5..849531a1 100644 --- a/libweston/meson.build +++ b/libweston/meson.build @@ -156,8 +156,8 @@ pkgconfig.generate( version: version_weston, description: 'libWeston protocol files', variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), - 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', dir_protocol_libweston) + 'datarootdir=' + '${prefix}' / get_option('datadir'), + 'pkgdatadir=' + '${pc_sysrootdir}${datarootdir}' / dir_protocol_libweston ], install_dir: dir_data_pc ) diff --git a/man/meson.build b/man/meson.build index aad90dce..fb6305ed 100644 --- a/man/meson.build +++ b/man/meson.build @@ -11,28 +11,28 @@ man_conf.set('version', version_weston) configure_file( input: 'weston.man', output: 'weston.1', - install_dir: join_paths(dir_man, 'man1'), + install_dir: dir_man / 'man1', configuration: man_conf ) configure_file( input: 'weston-bindings.man', output: 'weston-bindings.7', - install_dir: join_paths(dir_man, 'man7'), + install_dir: dir_man / 'man7', configuration: man_conf ) configure_file( input: 'weston-debug.man', output: 'weston-debug.1', - install_dir: join_paths(dir_man, 'man1'), + install_dir: dir_man / 'man1', configuration: man_conf ) configure_file( input: 'weston.ini.man', output: 'weston.ini.5', - install_dir: join_paths(dir_man, 'man5'), + install_dir: dir_man / 'man5', configuration: man_conf ) @@ -40,7 +40,7 @@ if get_option('backend-drm') configure_file( input: 'weston-drm.man', output: 'weston-drm.7', - install_dir: join_paths(dir_man, 'man7'), + install_dir: dir_man / 'man7', configuration: man_conf ) endif @@ -49,7 +49,7 @@ if get_option('backend-rdp') configure_file( input: 'weston-rdp.man', output: 'weston-rdp.7', - install_dir: join_paths(dir_man, 'man7'), + install_dir: dir_man / 'man7', configuration: man_conf ) endif @@ -58,7 +58,7 @@ if get_option('backend-vnc') configure_file( input: 'weston-vnc.man', output: 'weston-vnc.7', - install_dir: join_paths(dir_man, 'man7'), + install_dir: dir_man / 'man7', configuration: man_conf ) endif diff --git a/meson.build b/meson.build index a58c5936..58af9ee1 100644 --- a/meson.build +++ b/meson.build @@ -32,19 +32,19 @@ if not (get_option('deprecated-launcher-logind') or get_option('launcher-libseat endif dir_prefix = get_option('prefix') -dir_bin = join_paths(dir_prefix, get_option('bindir')) -dir_data = join_paths(dir_prefix, get_option('datadir')) +dir_bin = dir_prefix / get_option('bindir') +dir_data = dir_prefix / get_option('datadir') dir_include_libweston = 'libweston-@0@'.format(libweston_major) -dir_include_libweston_install = join_paths(dir_include_libweston, 'libweston') -dir_lib = join_paths(dir_prefix, get_option('libdir')) -dir_libexec = join_paths(dir_prefix, get_option('libexecdir')) -dir_module_weston = join_paths(dir_lib, 'weston') -dir_module_libweston = join_paths(dir_lib, 'libweston-@0@'.format(libweston_major)) -dir_data_pc = join_paths(dir_data, 'pkgconfig') -dir_lib_pc = join_paths(dir_lib, 'pkgconfig') -dir_man = join_paths(dir_prefix, get_option('mandir')) -dir_protocol_libweston = join_paths('libweston-@0@'.format(libweston_major), 'protocols') -dir_sysconf = join_paths(dir_prefix, get_option('sysconfdir')) +dir_include_libweston_install = dir_include_libweston / 'libweston' +dir_lib = dir_prefix /get_option('libdir') +dir_libexec = dir_prefix / get_option('libexecdir') +dir_module_weston = dir_lib / 'weston' +dir_module_libweston = dir_lib / 'libweston-@0@'.format(libweston_major) +dir_data_pc = dir_data / 'pkgconfig' +dir_lib_pc = dir_lib / 'pkgconfig' +dir_man = dir_prefix / get_option('mandir') +dir_protocol_libweston = 'libweston-@0@'.format(libweston_major) / 'protocols' +dir_sysconf = dir_prefix / get_option('sysconfdir') public_inc = include_directories('include') common_inc = [ include_directories('.'), public_inc ] @@ -182,7 +182,7 @@ subdir('pam') if meson.version().version_compare('>= 0.58.0') devenv = environment() devenv.set('WESTON_MODULE_MAP', env_modmap) - devenv.set('WESTON_DATA_DIR', join_paths(meson.current_source_dir(), 'data')) + devenv.set('WESTON_DATA_DIR', meson.current_source_dir() / 'data') meson.add_devenv(devenv) endif