summaryrefslogtreecommitdiff
path: root/kdrive
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-08-30 21:15:34 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-08-30 21:15:34 +0000
commita44ad52473f20dff65c36739dde07974609a5f54 (patch)
treecc51e06a67eacc8725f4c07ed5bd7ce02ec00389 /kdrive
parent1cfc000cccbae9b36cbd23f01ccdfe9c5a18b684 (diff)
Switch to xkeyboard-config is done. Remove old xkbdata and unifdef it.
ok shadchin@
Diffstat (limited to 'kdrive')
-rw-r--r--kdrive/Makefile.bsd-wrapper8
1 files changed, 1 insertions, 7 deletions
diff --git a/kdrive/Makefile.bsd-wrapper b/kdrive/Makefile.bsd-wrapper
index 21e033c4e..cef6da421 100644
--- a/kdrive/Makefile.bsd-wrapper
+++ b/kdrive/Makefile.bsd-wrapper
@@ -1,18 +1,12 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2011/05/30 10:52:58 shadchin Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2011/08/30 21:15:30 matthieu Exp $
.include <bsd.xconf.mk>
_SRCDIR= ${.CURDIR}/../xserver
-.if ${XENOCARA_USE_XKEYBOARD_CONFIG:L} == "yes"
XKB_PATH= ${X11BASE}/share/X11/xkb
XKB_RULES= base
XKB_OPTIONS= terminate:ctrl_alt_bksp
-.else
-XKB_PATH= /etc/X11/xkb
-XKB_RULES= xorg
-XKB_OPTIONS=
-.endif
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-xkb-path=${XKB_PATH} \