diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-05-30 10:52:59 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-05-30 10:52:59 +0000 |
| commit | 8a451c43839c0f0a10750371d9f75d79b3fe6d59 (patch) | |
| tree | e7e0c3d05aeab297ae65f866db4929842e188677 /xserver | |
| parent | 903ab7c78761b5fa7f61f9f969063c984b52cd01 (diff) | |
If you do not have XkbOptions in xorg.conf, it is automatically set to
"terminate: ctrl_alt_bksp" (only if XENOCARA_USE_XKEYBOARD_CONFIG=Yes)
tested ajacoutot@, ok matthieu@
Diffstat (limited to 'xserver')
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 0dbb173b2..9b0d66017 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.36 2011/04/27 20:46:31 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.37 2011/05/30 10:52:58 shadchin Exp $ .include <bsd.xconf.mk> @@ -34,15 +34,18 @@ DRI_OPTION= --disable-dri --disable-dri2 .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} \ --with-xkb-output=/var/db/xkb \ --with-default-xkb-rules=${XKB_RULES} \ + --with-default-xkb-options=${XKB_OPTIONS} \ --with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \ --enable-install-setuid --enable-privsep \ --enable-xcsecurity \ |