build: Switch join_paths(foo, bar) to foo / bar
Available since Meson 0.49. Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
parent
d65e819bf7
commit
386dcd904f
|
@ -64,7 +64,7 @@ pkgconfig.generate(
|
||||||
|
|
||||||
install_data(
|
install_data(
|
||||||
'weston.desktop',
|
'weston.desktop',
|
||||||
install_dir: join_paths(dir_data, 'wayland-sessions')
|
install_dir: dir_data / 'wayland-sessions'
|
||||||
)
|
)
|
||||||
|
|
||||||
if get_option('screenshare')
|
if get_option('screenshare')
|
||||||
|
|
|
@ -25,5 +25,5 @@ install_data(
|
||||||
'wayland.png',
|
'wayland.png',
|
||||||
'wayland.svg',
|
'wayland.svg',
|
||||||
],
|
],
|
||||||
install_dir: join_paths(dir_data, 'weston')
|
install_dir: dir_data / 'weston'
|
||||||
)
|
)
|
||||||
|
|
|
@ -89,7 +89,7 @@ docs = run_target(
|
||||||
|
|
||||||
install_subdir(
|
install_subdir(
|
||||||
sphinx_doc.full_path(),
|
sphinx_doc.full_path(),
|
||||||
install_dir: join_paths(dir_data, 'doc', 'weston'),
|
install_dir: dir_data / 'doc' / 'weston',
|
||||||
exclude_files: '.buildinfo',
|
exclude_files: '.buildinfo',
|
||||||
strip_directory: true,
|
strip_directory: true,
|
||||||
)
|
)
|
||||||
|
|
|
@ -156,8 +156,8 @@ pkgconfig.generate(
|
||||||
version: version_weston,
|
version: version_weston,
|
||||||
description: 'libWeston protocol files',
|
description: 'libWeston protocol files',
|
||||||
variables: [
|
variables: [
|
||||||
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
|
'datarootdir=' + '${prefix}' / get_option('datadir'),
|
||||||
'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', dir_protocol_libweston)
|
'pkgdatadir=' + '${pc_sysrootdir}${datarootdir}' / dir_protocol_libweston
|
||||||
],
|
],
|
||||||
install_dir: dir_data_pc
|
install_dir: dir_data_pc
|
||||||
)
|
)
|
||||||
|
|
|
@ -11,28 +11,28 @@ man_conf.set('version', version_weston)
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston.man',
|
input: 'weston.man',
|
||||||
output: 'weston.1',
|
output: 'weston.1',
|
||||||
install_dir: join_paths(dir_man, 'man1'),
|
install_dir: dir_man / 'man1',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston-bindings.man',
|
input: 'weston-bindings.man',
|
||||||
output: 'weston-bindings.7',
|
output: 'weston-bindings.7',
|
||||||
install_dir: join_paths(dir_man, 'man7'),
|
install_dir: dir_man / 'man7',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston-debug.man',
|
input: 'weston-debug.man',
|
||||||
output: 'weston-debug.1',
|
output: 'weston-debug.1',
|
||||||
install_dir: join_paths(dir_man, 'man1'),
|
install_dir: dir_man / 'man1',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston.ini.man',
|
input: 'weston.ini.man',
|
||||||
output: 'weston.ini.5',
|
output: 'weston.ini.5',
|
||||||
install_dir: join_paths(dir_man, 'man5'),
|
install_dir: dir_man / 'man5',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ if get_option('backend-drm')
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston-drm.man',
|
input: 'weston-drm.man',
|
||||||
output: 'weston-drm.7',
|
output: 'weston-drm.7',
|
||||||
install_dir: join_paths(dir_man, 'man7'),
|
install_dir: dir_man / 'man7',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
@ -49,7 +49,7 @@ if get_option('backend-rdp')
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston-rdp.man',
|
input: 'weston-rdp.man',
|
||||||
output: 'weston-rdp.7',
|
output: 'weston-rdp.7',
|
||||||
install_dir: join_paths(dir_man, 'man7'),
|
install_dir: dir_man / 'man7',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
@ -58,7 +58,7 @@ if get_option('backend-vnc')
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'weston-vnc.man',
|
input: 'weston-vnc.man',
|
||||||
output: 'weston-vnc.7',
|
output: 'weston-vnc.7',
|
||||||
install_dir: join_paths(dir_man, 'man7'),
|
install_dir: dir_man / 'man7',
|
||||||
configuration: man_conf
|
configuration: man_conf
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
26
meson.build
26
meson.build
|
@ -32,19 +32,19 @@ if not (get_option('deprecated-launcher-logind') or get_option('launcher-libseat
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dir_prefix = get_option('prefix')
|
dir_prefix = get_option('prefix')
|
||||||
dir_bin = join_paths(dir_prefix, get_option('bindir'))
|
dir_bin = dir_prefix / get_option('bindir')
|
||||||
dir_data = join_paths(dir_prefix, get_option('datadir'))
|
dir_data = dir_prefix / get_option('datadir')
|
||||||
dir_include_libweston = 'libweston-@0@'.format(libweston_major)
|
dir_include_libweston = 'libweston-@0@'.format(libweston_major)
|
||||||
dir_include_libweston_install = join_paths(dir_include_libweston, 'libweston')
|
dir_include_libweston_install = dir_include_libweston / 'libweston'
|
||||||
dir_lib = join_paths(dir_prefix, get_option('libdir'))
|
dir_lib = dir_prefix /get_option('libdir')
|
||||||
dir_libexec = join_paths(dir_prefix, get_option('libexecdir'))
|
dir_libexec = dir_prefix / get_option('libexecdir')
|
||||||
dir_module_weston = join_paths(dir_lib, 'weston')
|
dir_module_weston = dir_lib / 'weston'
|
||||||
dir_module_libweston = join_paths(dir_lib, 'libweston-@0@'.format(libweston_major))
|
dir_module_libweston = dir_lib / 'libweston-@0@'.format(libweston_major)
|
||||||
dir_data_pc = join_paths(dir_data, 'pkgconfig')
|
dir_data_pc = dir_data / 'pkgconfig'
|
||||||
dir_lib_pc = join_paths(dir_lib, 'pkgconfig')
|
dir_lib_pc = dir_lib / 'pkgconfig'
|
||||||
dir_man = join_paths(dir_prefix, get_option('mandir'))
|
dir_man = dir_prefix / get_option('mandir')
|
||||||
dir_protocol_libweston = join_paths('libweston-@0@'.format(libweston_major), 'protocols')
|
dir_protocol_libweston = 'libweston-@0@'.format(libweston_major) / 'protocols'
|
||||||
dir_sysconf = join_paths(dir_prefix, get_option('sysconfdir'))
|
dir_sysconf = dir_prefix / get_option('sysconfdir')
|
||||||
|
|
||||||
public_inc = include_directories('include')
|
public_inc = include_directories('include')
|
||||||
common_inc = [ include_directories('.'), public_inc ]
|
common_inc = [ include_directories('.'), public_inc ]
|
||||||
|
@ -182,7 +182,7 @@ subdir('pam')
|
||||||
if meson.version().version_compare('>= 0.58.0')
|
if meson.version().version_compare('>= 0.58.0')
|
||||||
devenv = environment()
|
devenv = environment()
|
||||||
devenv.set('WESTON_MODULE_MAP', env_modmap)
|
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)
|
meson.add_devenv(devenv)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue