From 830c4ef74c00dbe448da46cdbc576178abc5728e Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Tue, 1 May 2018 20:47:55 +0200 Subject: Meson: Replace option `instlibdir` with `libexecdir` Derive a value from it, called `rundir` rather than writing join_paths(libexecdir, 'sway') all over the place. --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 57dbea02..bd20ca99 100644 --- a/meson.build +++ b/meson.build @@ -19,12 +19,13 @@ is_freebsd = host_machine.system().startswith('freebsd') datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') -instlibdir = get_option('instlibdir') +libexecdir = get_option('libexecdir') -if instlibdir == '' - instlibdir = join_paths(prefix, 'lib/sway') +if libexecdir == '' + libexecdir = 'lib' endif -add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') +sway_libexecdir = join_paths(prefix, libexecdir, 'sway') +add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') jsonc = dependency('json-c', version: '>=0.13') -- cgit v1.2.3