diff options
author | Nicolas Braud-Santoni <nicolas@braud-santoni.eu> | 2018-05-01 20:47:55 +0200 |
---|---|---|
committer | Nicolas Braud-Santoni <nicolas@braud-santoni.eu> | 2018-05-05 17:22:46 +0200 |
commit | 830c4ef74c00dbe448da46cdbc576178abc5728e (patch) | |
tree | a0df4539f56d185a07d0a03a9c358ba775204c78 /meson.build | |
parent | Make the LIBDIR path configurable (diff) | |
download | sway-830c4ef74c00dbe448da46cdbc576178abc5728e.tar.gz sway-830c4ef74c00dbe448da46cdbc576178abc5728e.tar.zst sway-830c4ef74c00dbe448da46cdbc576178abc5728e.zip |
Meson: Replace option `instlibdir` with `libexecdir`
Derive a value from it, called `rundir` rather than writing join_paths(libexecdir,
'sway') all over the place.
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 9 |
1 files changed, 5 insertions, 4 deletions
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') | |||
19 | datadir = get_option('datadir') | 19 | datadir = get_option('datadir') |
20 | sysconfdir = get_option('sysconfdir') | 20 | sysconfdir = get_option('sysconfdir') |
21 | prefix = get_option('prefix') | 21 | prefix = get_option('prefix') |
22 | instlibdir = get_option('instlibdir') | 22 | libexecdir = get_option('libexecdir') |
23 | 23 | ||
24 | if instlibdir == '' | 24 | if libexecdir == '' |
25 | instlibdir = join_paths(prefix, 'lib/sway') | 25 | libexecdir = 'lib' |
26 | endif | 26 | endif |
27 | add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') | 27 | sway_libexecdir = join_paths(prefix, libexecdir, 'sway') |
28 | add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') | ||
28 | 29 | ||
29 | 30 | ||
30 | jsonc = dependency('json-c', version: '>=0.13') | 31 | jsonc = dependency('json-c', version: '>=0.13') |