diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 20:27:17 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-17 12:16:15 -0700 |
| commit | 82747989c1332290fabec8b9da38aad05282301f (patch) | |
| tree | 1953685853d207fbd9a9ad745bf02b359c51a877 /configure.ac | |
| parent | c2a5751175b11d3206805468aae1ddecd02c4a98 (diff) | |
Use platform-specific X server names in man pages for cygwin & darwin
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3e8ad50..419920f 100644 --- a/configure.ac +++ b/configure.ac @@ -170,22 +170,34 @@ fi AC_SUBST(STARTX_COOKIE_FLAGS) # Additional substitutions in startx, xinitrc & man pages +ARCHMANDEFS="" +SHELL_CMD="/bin/sh" +XSERVERNAME="Xorg" +XCONFIGFILE="xorg.conf" +XCONFIGFILEMAN='${XCONFIGFILE} (__filemansuffix__)' case $host_os in + cygwin*) + XSERVERNAME="XWin" + XCONFIGFILE="XWinrc" + ;; + darwin*) + XSERVERNAME="Xquartz" + XCONFIGFILE="defaults" + XCONFIGFILEMAN='defaults (1)' + ;; *solaris*) SHELL_CMD="/bin/ksh" - ARCHMANDEFS="" ;; *sco*) SHELL_CMD="/bin/ksh" ARCHMANDEFS="-D__SCOMAN__" ;; - *) - SHELL_CMD="/bin/sh" - ARCHMANDEFS="" - ;; esac AC_SUBST(SHELL_CMD) AC_SUBST(ARCHMANDEFS) +AC_SUBST(XSERVERNAME) +AC_SUBST(XCONFIGFILE) +AC_SUBST(XCONFIGFILEMAN) AC_SUBST(XRDB) AC_SUBST(XMODMAP) |