From 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:43 +0100 Subject: Revert "Meson: Replace option `instlibdir` with `libexecdir`" This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e. --- meson.build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index bd20ca99..57dbea02 100644 --- a/meson.build +++ b/meson.build @@ -19,13 +19,12 @@ is_freebsd = host_machine.system().startswith('freebsd') datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') -libexecdir = get_option('libexecdir') +instlibdir = get_option('instlibdir') -if libexecdir == '' - libexecdir = 'lib' +if instlibdir == '' + instlibdir = join_paths(prefix, 'lib/sway') endif -sway_libexecdir = join_paths(prefix, libexecdir, 'sway') -add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') +add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') jsonc = dependency('json-c', version: '>=0.13') -- cgit v1.2.3