Install desktop-shell in $prefix/libexec

2011-11-14 14:57:17 -05:00
parent d826404472
commit c4693c4ab4
3 changed files with 9 additions and 5 deletions
@@ -3,6 +3,7 @@ bin_PROGRAMS = wayland-compositor
 AM_CPPFLAGS =					\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
+	-DLIBEXECDIR='"$(libexecdir)"'		\
 	-DXSERVER_PATH='"@XSERVER_PATH@"'	\
 	$(COMPOSITOR_CFLAGS)

@@ -963,7 +963,7 @@ desktop_shell_sigchld(struct wlsc_process *process, int status)
 static int
 launch_desktop_shell_process(struct wl_shell *shell)
 {
-	const char *shell_exe = "./clients/desktop-shell";
+	const char *shell_exe = LIBEXECDIR "/wayland-desktop-shell";
 	struct wlsc_compositor *compositor = shell->compositor;
 	char s[32];
 	int sv[2], flags;