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:
+1
-2
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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())
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user