[PATCH weston 4/7] clients: Install to pkglibexecdir

[Quentin Glidic]

From: Quentin Glidic <sardemff7+git at sardemff7.net>

Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
 clients/Makefile.am      | 2 +-
 src/Makefile.am          | 2 +-
 src/screenshooter.c      | 2 +-
 src/shell.c              | 2 +-
 src/tablet-shell.c       | 2 +-
 src/text-backend.c       | 2 +-
 src/xwayland/Makefile.am | 3 ---
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/clients/Makefile.am b/clients/Makefile.am
index cad0d40..7bc06f2 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -9,7 +9,7 @@ noinst_PROGRAMS =				\
 	$(simple_clients_programs)		\
 	$(simple_egl_clients_programs)
 
-libexec_PROGRAMS =				\
+pkglibexec_PROGRAMS =				\
 	$(desktop_shell)			\
 	$(tablet_shell)				\
 	$(screenshooter)			\
diff --git a/src/Makefile.am b/src/Makefile.am
index 296b3a4..0390cc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS =					\
 	-I$(top_srcdir)/shared			\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
-	-DLIBEXECDIR='"$(libexecdir)"'		\
+	-DPKGLIBEXECDIR='"$(pkglibexecdir)"'	\
 	-DIN_WESTON
 
 weston_LDFLAGS = -export-dynamic
diff --git a/src/screenshooter.c b/src/screenshooter.c
index 1fdfc9a..d857f96 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -237,7 +237,7 @@ screenshooter_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
 		      void *data)
 {
 	struct screenshooter *shooter = data;
-	const char *screenshooter_exe = LIBEXECDIR "/weston-screenshooter";
+	const char *screenshooter_exe = PKGLIBEXECDIR "/weston-screenshooter";
 
 	if (!shooter->client)
 		shooter->client = weston_client_launch(shooter->ec,
diff --git a/src/shell.c b/src/shell.c
index 4447995..9d4999e 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -3584,7 +3584,7 @@ static void
 launch_desktop_shell_process(void *data)
 {
 	struct desktop_shell *shell = data;
-	const char *shell_exe = LIBEXECDIR "/weston-desktop-shell";
+	const char *shell_exe = PKGLIBEXECDIR "/weston-desktop-shell";
 
 	shell->child.client = weston_client_launch(shell->compositor,
 						 &shell->child.process,
diff --git a/src/tablet-shell.c b/src/tablet-shell.c
index 91e5110..f232b57 100644
--- a/src/tablet-shell.c
+++ b/src/tablet-shell.c
@@ -376,7 +376,7 @@ static const struct tablet_shell_interface tablet_shell_implementation = {
 static void
 launch_ux_daemon(struct tablet_shell *shell)
 {
-	const char *shell_exe = LIBEXECDIR "/weston-tablet-shell";
+	const char *shell_exe = PKGLIBEXECDIR "/weston-tablet-shell";
 
 	shell->client = weston_client_launch(shell->compositor,
 					   &shell->process,
diff --git a/src/text-backend.c b/src/text-backend.c
index cc7d65d..e078e3f 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -921,7 +921,7 @@ text_backend_configuration(struct text_backend *text_backend)
 					    "input-method", NULL, NULL);
 	weston_config_section_get_string(section, "path",
 					 &text_backend->input_method.path,
-					 LIBEXECDIR "/weston-keyboard");
+					 PKGLIBEXECDIR "/weston-keyboard");
 }
 
 static void
diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am
index 1f8ee5c..405d3fc 100644
--- a/src/xwayland/Makefile.am
+++ b/src/xwayland/Makefile.am
@@ -1,9 +1,6 @@
 AM_CPPFLAGS =					\
 	-I$(top_srcdir)/shared			\
 	-I$(top_builddir)/src			\
-	-DDATADIR='"$(datadir)"'		\
-	-DMODULEDIR='"$(moduledir)"'		\
-	-DLIBEXECDIR='"$(libexecdir)"'		\
 	-DXSERVER_PATH='"@XSERVER_PATH@"'
 
 module_LTLIBRARIES = xwayland.la
-- 
1.8.3