mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: make completions respect install prefixes 

Tell pkgconfig about prefix and datadir as required in the .pc files, so
if the prefix isn't standard nothing is installed outside of it.

For fish, this requires https://github.com/fish-shell/fish-shell/pull/6778

Fixes swaywm/swaybg#13
This commit is contained in:
Dominique Martinet 2020-03-29 10:06:48 +02:00 committed by Simon Ser
parent 3c96a1d374
commit 4e82d0fb15
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -263,7 +263,10 @@ if get_option('bash-completions')
'completions/bash/swaymsg',
)
if bash_comp.found()
bash_install_dir = bash_comp.get_pkgconfig_variable('completionsdir')
bash_install_dir = bash_comp.get_pkgconfig_variable(
'completionsdir',
define_variable: ['datadir', datadir]
)
else
bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
endif
@ -278,7 +281,10 @@ if get_option('fish-completions')
'completions/fish/swaynag.fish',
)
if fish_comp.found()
fish_install_dir = fish_comp.get_pkgconfig_variable('completionsdir')
fish_install_dir = fish_comp.get_pkgconfig_variable(
'completionsdir',
define_variable: ['datadir', datadir]
)
else
fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d')
endif