From 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:43 +0100 Subject: Revert "Meson: Replace option `instlibdir` with `libexecdir`" This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e. --- swaybg/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'swaybg/meson.build') 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 ) -- cgit v1.2.3-70-g09d2 From 2c0c3dc7cc3599a79fa464e1c093dead86f3cb65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:52 +0100 Subject: Revert "Make the LIBDIR path configurable" This reverts commit 1670b46bf6e56d37e69ab0fa32c6799e83397020. --- meson.build | 7 ------- meson_options.txt | 1 - sway/commands/exec_always.c | 4 ++-- swaybar/meson.build | 2 +- swaybg/meson.build | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) (limited to 'swaybg/meson.build') diff --git a/meson.build b/meson.build index 57dbea02..bf266e5f 100644 --- 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 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 8483cf26..16bbcb61 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 = ":/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 index ad7ed5fe..f115ffa2 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: 'usr/lib/sway' ) diff --git a/swaybg/meson.build b/swaybg/meson.build index e994da8f..c1bb7d18 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: 'usr/lib/sway' ) -- cgit v1.2.3-70-g09d2 From 3b6629af3c268fd0dd6f42feaf3429bb25cfcb6f Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:20:57 +0100 Subject: Revert "Install swaybar and swaybg under /usr/lib/sway" This reverts commit f2c209c299889ad965ac995049704b1c46176c6d. --- swaybar/meson.build | 3 +-- swaybg/meson.build | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'swaybg/meson.build') diff --git a/swaybar/meson.build b/swaybar/meson.build index f115ffa2..d65edb11 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -24,6 +24,5 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install: true, - install_dir: 'usr/lib/sway' + install: true ) diff --git a/swaybg/meson.build b/swaybg/meson.build index c1bb7d18..8704de6d 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -14,6 +14,5 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install: true, - install_dir: 'usr/lib/sway' + install: true ) -- cgit v1.2.3-70-g09d2