mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <marius.vlad0@gmail.com>
This commit is contained in:
Marius Vlad 2018-12-15 15:57:19 +02:00
parent 64fbd0f41f
commit d85fe29c1f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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

2
clients/meson.build
View File

@ -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())

2
compositor/weston-screenshooter.c
View File

@ -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;