openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-10 03:08:56 +00:00
Code Issues Projects Releases Wiki Activity

If you do not have XkbOptions in xorg.conf, it is automatically set to

Browse Source 
"terminate: ctrl_alt_bksp" (only if XENOCARA_USE_XKEYBOARD_CONFIG=Yes)

tested ajacoutot@, ok matthieu@
This commit is contained in:
shadchin
2011-05-30 10:52:57 +00:00
parent d4da5d37ed
commit 89a8ad0171
8 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xserver/Makefile.bsd-wrapper
View File

@@ -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 \