mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into fix-freebsd-build

Browse source
This commit is contained in:
sghctoma 2018-09-03 08:57:17 +02:00
commit df730a8891
22 changed files with 173 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
meson.build
View file

@ -106,7 +106,7 @@ endif
add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c')
version = get_option('sway_version')
version = get_option('sway-version')
if version != ''
version = '"@0@"'.format(version)
else
@ -120,6 +120,8 @@ else
endif
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
add_project_arguments('-D_LD_LIBRARY_PATH="@0@"'.format(get_option('ld-library-path')), language: 'c')
sway_inc = include_directories('include')
subdir('include')
@ -168,7 +170,7 @@ install_data(
install_dir: datadir + '/wayland-sessions'
)
if (get_option('default_wallpaper'))
if (get_option('default-wallpaper'))
wallpaper_files = files(
'assets/Sway_Wallpaper_Blue_768x1024.png',
'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png',
@ -184,7 +186,7 @@ if (get_option('default_wallpaper'))
install_data(wallpaper_files, install_dir: wallpaper_install_dir)
endif
if (get_option('zsh_completions'))
if (get_option('zsh-completions'))
zsh_files = files(
'completions/zsh/_sway',
'completions/zsh/_swaylock',
@ -195,7 +197,7 @@ if (get_option('zsh_completions'))
install_data(zsh_files, install_dir: zsh_install_dir)
endif
if (get_option('bash_completions'))
if (get_option('bash-completions'))
bash_files = files(
'completions/bash/sway',
'completions/bash/swayidle',
@ -207,7 +209,7 @@ if (get_option('bash_completions'))
install_data(bash_files, install_dir: bash_install_dir)
endif
if (get_option('fish_completions'))
if (get_option('fish-completions'))
fish_files = files(
'completions/fish/sway.fish',
'completions/fish/swaylock.fish',