Revert "Meson: Replace option `instlibdir` with `libexecdir`"

This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e.

5 files changed, 9 insertions, 9 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')
 datadir = get_option('datadir')
 sysconfdir = get_option('sysconfdir')
 prefix = get_option('prefix')
-libexecdir = get_option('libexecdir')
+instlibdir = get_option('instlibdir')
 
-if libexecdir == ''
-        libexecdir = 'lib'
+if instlibdir == ''
+  instlibdir = join_paths(prefix, 'lib/sway')
 endif
-sway_libexecdir = join_paths(prefix, libexecdir, 'sway')
-add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c')
+add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c')
 
 
 jsonc          = dependency('json-c', version: '>=0.13')
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 1d95dc96..8483cf26 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 = ":" SWAY_LIBEXECDIR;
-                        const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 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 41c81a88..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: sway_libexecdir
+        install_dir: instlibdir
 )
diff --git a/swaybg/meson.build b/swaybg/meson.build
index 716178d2..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: sway_libexecdir
+        install_dir: instlibdir
 )