From 462e15d9a506f2265d4b20bfbc1c245be5f82a17 Mon Sep 17 00:00:00 2001 From: sghctoma Date: Thu, 30 Aug 2018 09:40:35 +0200 Subject: Make libcap an optional dependency FreeBSD does not have libcap, so without "required: false" Sway fails to build. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index d5b33e6b..61fcff42 100644 --- a/meson.build +++ b/meson.build @@ -38,7 +38,7 @@ pango = dependency('pango') pangocairo = dependency('pangocairo') gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: false) pixman = dependency('pixman-1') -libcap = dependency('libcap') +libcap = dependency('libcap', required: false) libinput = dependency('libinput', version: '>=1.6.0') libpam = cc.find_library('pam') systemd = dependency('libsystemd', required: false) -- cgit v1.2.3 From 6942f5b6845b2cc572ec378365771a34caf50ba1 Mon Sep 17 00:00:00 2001 From: sghctoma Date: Thu, 30 Aug 2018 09:44:24 +0200 Subject: Fix SYSCONFDIR to include "prefix" SYSCONFDIR is used to determine the path of the default configuration file. 'sysconfdir' is set to 'prefix/sysconfdir' later (on line 139), so configuration files are installed under 'prefix', but SYSCONFDIR did not reflect it. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 61fcff42..57b024c8 100644 --- a/meson.build +++ b/meson.build @@ -104,7 +104,7 @@ if scdoc.found() endforeach endif -add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') +add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c') version = get_option('sway_version') if version != '' -- cgit v1.2.3