diff options
| author |  Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-05-06 00:19:43 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-05-06 00:19:43 +0100 |
| commit | 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65 (patch) | |
| tree | e56bf6be92b10a3272bf4233566522ad5830efc0 /meson.build | |
| parent | Revert "command/exec_always: Use wlr_log for logging errors in the child proc... (diff) | |
| download | sway-0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65.tar.gz sway-0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65.tar.zst sway-0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65.zip | |
Revert "Meson: Replace option `instlibdir` with `libexecdir`"
This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 9 |
1 files changed, 4 insertions, 5 deletions
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') | |||
| 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 | libexecdir = get_option('libexecdir') | 22 | instlibdir = get_option('instlibdir') |
| 23 | 23 | ||
| 24 | if libexecdir == '' | 24 | if instlibdir == '' |
| 25 | libexecdir = 'lib' | 25 | instlibdir = join_paths(prefix, 'lib/sway') |
| 26 | endif | 26 | endif |
| 27 | sway_libexecdir = join_paths(prefix, libexecdir, 'sway') | 27 | add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') |
| 28 | add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') | ||
| 29 | 28 | ||
| 30 | 29 | ||
| 31 | jsonc = dependency('json-c', version: '>=0.13') | 30 | jsonc = dependency('json-c', version: '>=0.13') |