summaryrefslogtreecommitdiff
path: root/xserver/Makefile.bsd-wrapper
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-01-27 16:28:58 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-01-27 16:28:58 +0000
commit8b175ae058ffc2246d663192952ee201389f9e64 (patch)
tree3fae6aa0f46ea80655bcfde362447e72e7ae923c /xserver/Makefile.bsd-wrapper
parent4982ad8d18f129ac6f7669a0fe006cfe5917203f (diff)
Don't allow to build kdrive here anymore. This is now in ../kdrive.
Diffstat (limited to 'xserver/Makefile.bsd-wrapper')
-rw-r--r--xserver/Makefile.bsd-wrapper13
1 files changed, 1 insertions, 12 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 8c78d831a..4c5f3faba 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.25 2008/11/02 15:26:08 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.26 2009/01/27 16:28:57 matthieu Exp $
.include <bsd.xconf.mk>
@@ -32,7 +32,6 @@ DRI_OPTION= --enable-dri --with-dri-driver-path=${X11BASE}/lib/modules/dri
DRI_OPTION= --disable-dri
.endif
-.if !defined(KDRIVE)
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/db/xkb \
@@ -40,15 +39,5 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--enable-install-setuid --enable-privsep \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
--disable-ioport ${DRI_OPTION}
-.else
-CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
- --disable-xorg \
- --disable-xinput \
- --enable-kdrive \
- --disable-dmx \
- --disable-xprint \
- --disable-xnest \
- --disable-xvfb
-.endif
.include <bsd.xorg.mk>