aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2019-03-10 22:59:15 +0100
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-03-11 10:57:16 -0400
commit2c0b65f575dcd94450dfd1bc7b39de38b3f8411d (patch)
tree00dd976662b1b22a1f5bef14bdf69b75ed258827
parentFix crash in cmd_workspace when layer surface has focus (diff)
downloadsway-2c0b65f575dcd94450dfd1bc7b39de38b3f8411d.tar.gz
sway-2c0b65f575dcd94450dfd1bc7b39de38b3f8411d.tar.zst
sway-2c0b65f575dcd94450dfd1bc7b39de38b3f8411d.zip
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 a08b2603..02b5d606 100644
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,7 @@ elogind = dependency('libelogind', version: '>=239', required: false)
57xcb = dependency('xcb', required: get_option('xwayland')) 57xcb = dependency('xcb', required: get_option('xwayland'))
58math = cc.find_library('m') 58math = cc.find_library('m')
59rt = cc.find_library('rt') 59rt = cc.find_library('rt')
60git = find_program('git', required: false) 60git = find_program('git', native: true, required: false)
61 61
62# Try first to find wlroots as a subproject, then as a system dependency 62# Try first to find wlroots as a subproject, then as a system dependency
63wlroots_version = '>=0.4.1' 63wlroots_version = '>=0.4.1'
@@ -97,8 +97,8 @@ conf_data.set10('HAVE_TRAY', have_tray)
97 97
98scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) 98scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
99if scdoc.found() 99if scdoc.found()
100 scdoc_prog = find_program('scdoc') 100 scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
101 sh = find_program('sh') 101 sh = find_program('sh', native: true)
102 mandir = get_option('mandir') 102 mandir = get_option('mandir')
103 man_files = [ 103 man_files = [
104 'sway/sway.1.scd', 104 'sway/sway.1.scd',