aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-03-10 22:59:15 +0100
committerBrian Ashworth <bosrsf04@gmail.com>2019-03-10 18:18:08 -0400
commita418349c188288ebe1e8aeb9cb002e484d3e1f17 (patch)
tree14c625a2bc69dc5e860e15b2a2ac9aae2aa416d5
parent30931ad9e77b106956007530821d98bc20bca969 (diff)
downloadsway-a418349c188288ebe1e8aeb9cb002e484d3e1f17.zip
sway-a418349c188288ebe1e8aeb9cb002e484d3e1f17.tar.gz
sway-a418349c188288ebe1e8aeb9cb002e484d3e1f17.tar.bz2
meson: use pkg-config var for scdoc path
-rw-r--r--meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index a08b260..02b5d60 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',