diff options
-rw-r--r-- | meson.build | 14 | ||||
-rw-r--r-- | protocols/meson.build | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 7ff085b5..ee7c43f1 100644 --- a/meson.build +++ b/meson.build | |||
@@ -128,7 +128,7 @@ conf_data.set10('HAVE_TRAY', have_tray) | |||
128 | 128 | ||
129 | scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) | 129 | scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) |
130 | if scdoc.found() | 130 | if scdoc.found() |
131 | scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) | 131 | scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true) |
132 | sh = find_program('sh', native: true) | 132 | sh = find_program('sh', native: true) |
133 | mandir = get_option('mandir') | 133 | mandir = get_option('mandir') |
134 | man_files = [ | 134 | man_files = [ |
@@ -278,9 +278,9 @@ if get_option('bash-completions') | |||
278 | 'completions/bash/swaymsg', | 278 | 'completions/bash/swaymsg', |
279 | ) | 279 | ) |
280 | if bash_comp.found() | 280 | if bash_comp.found() |
281 | bash_install_dir = bash_comp.get_pkgconfig_variable( | 281 | bash_install_dir = bash_comp.get_variable( |
282 | 'completionsdir', | 282 | pkgconfig: 'completionsdir', |
283 | define_variable: ['datadir', datadir] | 283 | pkgconfig_define: ['datadir', datadir] |
284 | ) | 284 | ) |
285 | else | 285 | else |
286 | bash_install_dir = join_paths(datadir, 'bash-completion', 'completions') | 286 | bash_install_dir = join_paths(datadir, 'bash-completion', 'completions') |
@@ -296,9 +296,9 @@ if get_option('fish-completions') | |||
296 | 'completions/fish/swaynag.fish', | 296 | 'completions/fish/swaynag.fish', |
297 | ) | 297 | ) |
298 | if fish_comp.found() | 298 | if fish_comp.found() |
299 | fish_install_dir = fish_comp.get_pkgconfig_variable( | 299 | fish_install_dir = fish_comp.get_variable( |
300 | 'completionsdir', | 300 | pkgconfig: 'completionsdir', |
301 | define_variable: ['datadir', datadir] | 301 | pkgconfig_define: ['datadir', datadir] |
302 | ) | 302 | ) |
303 | else | 303 | else |
304 | fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d') | 304 | fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d') |
diff --git a/protocols/meson.build b/protocols/meson.build index 124e9777..8c4ae0af 100644 --- a/protocols/meson.build +++ b/protocols/meson.build | |||
@@ -1,9 +1,9 @@ | |||
1 | wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') | 1 | wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir') |
2 | 2 | ||
3 | wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) | 3 | wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) |
4 | if wayland_scanner_dep.found() | 4 | if wayland_scanner_dep.found() |
5 | wayland_scanner = find_program( | 5 | wayland_scanner = find_program( |
6 | wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'), | 6 | wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'), |
7 | native: true, | 7 | native: true, |
8 | ) | 8 | ) |
9 | else | 9 | else |