1 --- xinit-1.0.8/Makefile.am.orig 2008-03-06 23:08:48.000000000 +0100
2 +++ xinit-1.0.8/Makefile.am 2008-03-08 02:11:36.208958943 +0100
7 - -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DLIBDIR=$(libdir) \
8 + -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DBINDIR=$(bindir) -DLIBDIR=$(libdir) \
9 -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
10 -D__libexecdir__="$(libexecdir)" \
11 -D__bindir__="$(bindir)" \
12 --- xinit-1.0.8/startx.cpp 2005-11-15 05:03:10.000000000 +0100
13 +++ xinit-1.0.8/startx.cpp 2005-12-22 10:53:22.620963000 +0100
15 userserverrc=$HOME/.xserverrc
16 sysserverrc=XINITDIR/xserverrc
18 -defaultserver=XSERVER
19 +defaultserver=BINDIR/Xwrapper
23 --- xinit-1.3.0/xinit.c.orig 2010-06-12 03:14:10.000000000 +0200
24 +++ xinit-1.3.0/xinit.c 2010-10-31 10:38:50.551098261 +0100
29 +static char *default_wrapper = BINDIR "/Xwrapper";
30 static char *default_server = "X";
31 static char *default_display = ":0"; /* choose most efficient */
32 static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
36 (**argv != '/' && **argv != '.')) {
37 - *sptr++ = default_server;
38 + if (access(default_wrapper, X_OK) == 0)
39 + *sptr++ = default_wrapper;
41 + *sptr++ = default_server;