meson: use join_paths to build paths, instead of string concat

It makes sure to handle paths as paths, and is generally safer and the
blessed solution.
master
Eli Schwartz 5 years ago committed by Simon Ser
parent 8faaf52f7f
commit fe558cf627

@ -204,7 +204,7 @@ configure_file(
configuration: config, configuration: config,
input: 'config.in', input: 'config.in',
output: '@BASENAME@', output: '@BASENAME@',
install_dir: sysconfdir + '/sway' install_dir: join_paths(sysconfdir, 'sway')
) )
if is_freebsd if is_freebsd
@ -212,20 +212,20 @@ if is_freebsd
configuration: config, configuration: config,
input: 'security.d/10-freebsd.in', input: 'security.d/10-freebsd.in',
output: '@BASENAME@', output: '@BASENAME@',
install_dir: sysconfdir + '/sway/security.d' install_dir: join_paths(sysconfdir, 'sway', 'security.d')
) )
else else
configure_file( configure_file(
configuration: config, configuration: config,
input: 'security.d/00-defaults.in', input: 'security.d/00-defaults.in',
output: '@BASENAME@', output: '@BASENAME@',
install_dir: sysconfdir + '/sway/security.d' install_dir: join_paths(sysconfdir, 'sway', 'security.d')
) )
endif endif
install_data( install_data(
'sway.desktop', 'sway.desktop',
install_dir: datadir + '/wayland-sessions' install_dir: join_paths(datadir, 'wayland-sessions')
) )
if get_option('default-wallpaper') if get_option('default-wallpaper')
@ -239,7 +239,7 @@ if get_option('default-wallpaper')
'assets/Sway_Wallpaper_Blue_2048x1536.png', 'assets/Sway_Wallpaper_Blue_2048x1536.png',
'assets/Sway_Wallpaper_Blue_2048x1536_Portrait.png', 'assets/Sway_Wallpaper_Blue_2048x1536_Portrait.png',
) )
wallpaper_install_dir = datadir + '/backgrounds/sway' wallpaper_install_dir = join_paths(datadir, 'backgrounds', 'sway')
install_data(wallpaper_files, install_dir: wallpaper_install_dir) install_data(wallpaper_files, install_dir: wallpaper_install_dir)
endif endif
@ -249,7 +249,7 @@ if get_option('zsh-completions')
'completions/zsh/_sway', 'completions/zsh/_sway',
'completions/zsh/_swaymsg', 'completions/zsh/_swaymsg',
) )
zsh_install_dir = datadir + '/zsh/site-functions' zsh_install_dir = join_paths(datadir, 'zsh', 'site-functions')
install_data(zsh_files, install_dir: zsh_install_dir) install_data(zsh_files, install_dir: zsh_install_dir)
endif endif
@ -260,7 +260,7 @@ if get_option('bash-completions')
'completions/bash/swaybar', 'completions/bash/swaybar',
'completions/bash/swaymsg', 'completions/bash/swaymsg',
) )
bash_install_dir = datadir + '/bash-completion/completions' bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
install_data(bash_files, install_dir: bash_install_dir) install_data(bash_files, install_dir: bash_install_dir)
endif endif
@ -271,7 +271,7 @@ if get_option('fish-completions')
'completions/fish/swaymsg.fish', 'completions/fish/swaymsg.fish',
'completions/fish/swaynag.fish', 'completions/fish/swaynag.fish',
) )
fish_install_dir = datadir + '/fish/completions' fish_install_dir = join_paths(datadir, 'fish', 'completions')
install_data(fish_files, install_dir: fish_install_dir) install_data(fish_files, install_dir: fish_install_dir)
endif endif

Loading…
Cancel
Save