diff options
| author | Nicolas Braud-Santoni <nicolas@braud-santoni.eu> | 2018-05-01 16:49:15 +0200 |
|---|---|---|
| committer | Nicolas Braud-Santoni <nicolas@braud-santoni.eu> | 2018-05-05 17:22:46 +0200 |
| commit | 1670b46bf6e56d37e69ab0fa32c6799e83397020 (patch) | |
| tree | 28f4420e4658765f8f6693ff9bda32468962f7d2 | |
| parent | 7709340727fe2834f87b43aeeaef878694d5acd6 (diff) | |
Make the LIBDIR path configurable
| -rw-r--r-- | meson.build | 7 | ||||
| -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, 12 insertions, 4 deletions
diff --git a/meson.build b/meson.build index bf266e5f..57dbea02 100644 --- a/meson.build +++ b/meson.build @@ -19,6 +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') + +if instlibdir == '' + instlibdir = join_paths(prefix, 'lib/sway') +endif +add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') + jsonc = dependency('json-c', version: '>=0.13') pcre = dependency('libpcre') diff --git a/meson_options.txt b/meson_options.txt index 541ccf13..6c3dcd58 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +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 af4bd739..3f3a7940 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 = ":/usr/lib/sway"; - const size_t extra_size = sizeof("/usr/lib/sway") + 1; + const char *extra_path = ":" INSTLIBDIR; + const size_t extra_size = sizeof(INSTLIBDIR) + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); diff --git a/swaybar/meson.build b/swaybar/meson.build index f115ffa2..ad7ed5fe 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: 'usr/lib/sway' + install_dir: instlibdir ) diff --git a/swaybg/meson.build b/swaybg/meson.build index c1bb7d18..e994da8f 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: 'usr/lib/sway' + install_dir: instlibdir ) |