From 2c0b65f575dcd94450dfd1bc7b39de38b3f8411d Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 10 Mar 2019 22:59:15 +0100 Subject: [PATCH] meson: use pkg-config var for scdoc path --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index a08b2603..02b5d606 100644 --- a/meson.build +++ b/meson.build @@ -57,7 +57,7 @@ elogind = dependency('libelogind', version: '>=239', required: false) xcb = dependency('xcb', required: get_option('xwayland')) math = cc.find_library('m') rt = cc.find_library('rt') -git = find_program('git', required: false) +git = find_program('git', native: true, required: false) # Try first to find wlroots as a subproject, then as a system dependency wlroots_version = '>=0.4.1' @@ -97,8 +97,8 @@ conf_data.set10('HAVE_TRAY', have_tray) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) if scdoc.found() - scdoc_prog = find_program('scdoc') - sh = find_program('sh') + scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) + sh = find_program('sh', native: true) mandir = get_option('mandir') man_files = [ 'sway/sway.1.scd',