diff options
-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') | |||
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') |
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 @@ | |||
1 | option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)') | ||
2 | option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') | 1 | option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') |
3 | option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') | 2 | option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') |
4 | option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') | 3 | 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) { | |||
55 | if ((*child = fork()) == 0) { | 55 | if ((*child = fork()) == 0) { |
56 | // Acquire the current PATH | 56 | // Acquire the current PATH |
57 | char *path = getenv("PATH"); | 57 | char *path = getenv("PATH"); |
58 | const char *extra_path = ":" INSTLIBDIR; | 58 | const char *extra_path = ":" SWAY_LIBEXECDIR; |
59 | const size_t extra_size = sizeof(INSTLIBDIR) + 1; | 59 | const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1; |
60 | 60 | ||
61 | if (!path) { | 61 | if (!path) { |
62 | size_t n = confstr(_CS_PATH, NULL, 0); | 62 | 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( | |||
25 | ], | 25 | ], |
26 | link_with: [lib_sway_common, lib_sway_client], | 26 | link_with: [lib_sway_common, lib_sway_client], |
27 | install: true, | 27 | install: true, |
28 | install_dir: instlibdir | 28 | install_dir: sway_libexecdir |
29 | ) | 29 | ) |
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( | |||
15 | ], | 15 | ], |
16 | link_with: [lib_sway_common, lib_sway_client], | 16 | link_with: [lib_sway_common, lib_sway_client], |
17 | install: true, | 17 | install: true, |
18 | install_dir: instlibdir | 18 | install_dir: sway_libexecdir |
19 | ) | 19 | ) |