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 | |
| parent | 1670b46bf6e56d37e69ab0fa32c6799e83397020 (diff) | |
| download | sway-830c4ef74c00dbe448da46cdbc576178abc5728e.tar.xz | |
Meson: Replace option `instlibdir` with `libexecdir`
Derive a value from it, called `rundir` rather than writing join_paths(libexecdir,
'sway') all over the place.
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | sway/commands/exec_always.c | 4 | ||||
| -rw-r--r-- | swaybar/meson.build | 2 | ||||
| -rw-r--r-- | swaybg/meson.build | 2 |
5 files changed, 9 insertions, 9 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') 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') diff --git a/meson_options.txt b/meson_options.txt index 6c3dcd58..541ccf13 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,3 @@ -option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 3f3a7940..aaee940b 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":" INSTLIBDIR; - const size_t extra_size = sizeof(INSTLIBDIR) + 1; + const char *extra_path = ":" SWAY_LIBEXECDIR; + const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); diff --git a/swaybar/meson.build b/swaybar/meson.build index ad7ed5fe..41c81a88 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -25,5 +25,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: instlibdir + install_dir: sway_libexecdir ) diff --git a/swaybg/meson.build b/swaybg/meson.build index e994da8f..716178d2 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -15,5 +15,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: instlibdir + install_dir: sway_libexecdir ) |