mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xserver: use $bindir prefix when launching X

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-07-21 06:46:05 -07:00
parent 535e2c65c7
commit b3b425c8d1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/Makefile.am
+1
View File
@@ -3,6 +3,7 @@ bin_PROGRAMS = wayland-compositor
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \ -DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
-DBINDIR='"$(bindir)"' \
$(COMPOSITOR_CFLAGS) $(COMPOSITOR_CFLAGS)
wayland_compositor_LDFLAGS = -export-dynamic wayland_compositor_LDFLAGS = -export-dynamic
compositor/xserver-launcher.c
+2 -2
View File
@@ -483,8 +483,8 @@ wlsc_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
snprintf(logfile, sizeof logfile, snprintf(logfile, sizeof logfile,
"/tmp/x-log-%d", mxs->display); "/tmp/x-log-%d", mxs->display);
if (execl("/usr/bin/Xorg", if (execl(BINDIR "/Xorg",
"/usr/bin/Xorg", BINDIR "/Xorg",
display, display,
"-wayland", "-wayland",
"-rootless", "-rootless",