summaryrefslogtreecommitdiff
path: root/xserver/Makefile.bsd-wrapper
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-02-19 19:51:54 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-02-19 19:51:54 +0000
commit1f67a45421112cd248393b710e62bbf5003265a1 (patch)
tree6f4dbc7980c5734d35cc5751a9a01ae22389eefa /xserver/Makefile.bsd-wrapper
parent2b6e9b95ac80f591c9c75a8ce93d4ef73634fc5d (diff)
Disable Xorg on alpha. Xrender is broken since 2 releases and I still
don't know how to fix it. ok miod@, todd@
Diffstat (limited to 'xserver/Makefile.bsd-wrapper')
-rw-r--r--xserver/Makefile.bsd-wrapper8
1 files changed, 4 insertions, 4 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 566bb34bf..f393e3257 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.32 2011/01/02 14:23:40 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.33 2011/02/19 19:51:53 matthieu Exp $
.include <bsd.xconf.mk>
DIST= ${.CURDIR}
# Machines for which we don't build the Xorg Xserver
-NO_XORG_MACHINES= aviion hppa64 landisk \
+NO_XORG_MACHINES= alpha aviion hppa64 landisk \
mvme68k mvme88k mvmeppc solbourne vax
NO_XF86UTIL_MACHINES= hp300 landisk mac68k sgi sparc vax
@@ -32,9 +32,9 @@ DRI_OPTION= --disable-dri --disable-dri2
.endif
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
- --with-xkb-path=/etc/X11/xkb \
+ --with-xkb-path=${X11BASE}/share/X11/xkb \
--with-xkb-output=/var/db/xkb \
- --with-default-xkb-rules=xorg \
+ --with-default-xkb-rules=base \
--with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \
--enable-install-setuid --enable-privsep \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \