sway

commit 2c0c3dc7cc3599a79fa464e1c093dead86f3cb65
parent 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65
Author: Rostislav Pehlivanov <atomnuker@gmail.com>
Date:   Sun,  6 May 2018 00:19:52 +0100

Revert "Make the LIBDIR path configurable"

This reverts commit 1670b46bf6e56d37e69ab0fa32c6799e83397020.

Diffstat:
M
meson.build
 | 
7
-------
M
meson_options.txt
 | 
1
-
M
sway/commands/exec_always.c
 | 
4
++--
M
swaybar/meson.build
 | 
2
+-
M
swaybg/meson.build
 | 
2
+-

5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/meson.build b/meson.build
@@ -19,13 +19,6 @@ 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
@@ -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
@@ -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 = ":/usr/lib/sway";
+			const size_t extra_size = sizeof("/usr/lib/sway") + 1;
 
 			if (!path) {
 				size_t n = confstr(_CS_PATH, NULL, 0);
diff --git 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: 'usr/lib/sway'
 )
diff --git 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: 'usr/lib/sway'
 )