From d85fe29c1f4fbe33801ed1361a3a283f8d3aee9c Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Sat, 15 Dec 2018 15:57:19 +0200 Subject: [PATCH] compositor: Install weston-screenshooter in BINDIR Previously weston-screenshooter was installed in LIBEXECDIR, but given that now it can be invoked by the user whenever debug protocol is enabled, let's intall it into BINDIR. This way, it can be invoked without the need to modify PATH. Signed-off-by: Marius Vlad --- Makefile.am | 3 +-- clients/meson.build | 2 +- compositor/weston-screenshooter.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 359f7e99..3c2fea50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -548,11 +548,10 @@ spring_tool_SOURCES = \ if BUILD_CLIENTS -bin_PROGRAMS += weston-terminal weston-info weston-debug +bin_PROGRAMS += weston-terminal weston-info weston-debug weston-screenshooter libexec_PROGRAMS += \ weston-desktop-shell \ - weston-screenshooter \ weston-keyboard \ weston-simple-im diff --git a/clients/meson.build b/clients/meson.build index 42590e1e..70b76371 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -331,7 +331,7 @@ if get_option('shell-desktop') weston_screenshooter_protocol_c, include_directories: include_directories('..'), dependencies: dep_toytoolkit, - install_dir: get_option('libexecdir'), + install_dir: get_option('bindir'), install: true ) env_modmap += 'weston-screenshooter=@0@;'.format(exe_shooter.full_path()) diff --git a/compositor/weston-screenshooter.c b/compositor/weston-screenshooter.c index c23a6944..13dea3f1 100644 --- a/compositor/weston-screenshooter.c +++ b/compositor/weston-screenshooter.c @@ -127,7 +127,7 @@ screenshooter_binding(struct weston_keyboard *keyboard, char *screenshooter_exe; - screenshooter_exe = wet_get_libexec_path("weston-screenshooter"); + screenshooter_exe = wet_get_bindir_path("weston-screenshooter"); if (!screenshooter_exe) { weston_log("Could not construct screenshooter path.\n"); return;