xserver: use $bindir prefix when launching X

14 years ago · b3b425c8d1
parent 535e2c65c7
commit b3b425c8d1
2 changed files with 3 additions and 2 deletions
--- a/compositor/Makefile.am
+++ b/compositor/Makefile.am
@ -3,6 +3,7 @@ bin_PROGRAMS = wayland-compositor
 AM_CPPFLAGS =					\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
+	-DBINDIR='"$(bindir)"'			\
 	$(COMPOSITOR_CFLAGS)

 wayland_compositor_LDFLAGS = -export-dynamic
--- a/compositor/xserver-launcher.c
+++ b/compositor/xserver-launcher.c
@ -483,8 +483,8 @@ wlsc_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
 		snprintf(logfile, sizeof logfile,
 			 "/tmp/x-log-%d", mxs->display);

-		if (execl("/usr/bin/Xorg",
-			  "/usr/bin/Xorg",
+		if (execl(BINDIR "/Xorg",
+			  BINDIR "/Xorg",
 			  display,
 			  "-wayland",
 			  "-rootless",