diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-26 21:17:54 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-05-02 21:03:28 -0700 |
| commit | 22a1953c4a2747d637bb926034f11134809b8d06 (patch) | |
| tree | c9b9036c7d14a95a5d655af9de014d1e03b58ea2 | |
| parent | 90299556db24543bb7365e8c2897deca3aa219e7 (diff) | |
XQuartz: Make sure we tell startx the correct server binary to use in our fallback path
With multiple servers installed, we can't be certain if X is Xorg or Xquartz
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 93d6ba5b711cbd3f502d83e54c9739856d2e6f2a)
| -rw-r--r-- | hw/xquartz/mach-startup/bundle-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c index d1ad6f7e3..cabdf1eab 100644 --- a/hw/xquartz/mach-startup/bundle-main.c +++ b/hw/xquartz/mach-startup/bundle-main.c @@ -78,7 +78,7 @@ FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN; extern int noPanoramiXExtension; #define DEFAULT_CLIENT X11BINDIR "/xterm" -#define DEFAULT_STARTX X11BINDIR "/startx" +#define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz" #define DEFAULT_SHELL "/bin/sh" #ifndef BUILD_DATE |