diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-01-02 14:23:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-01-02 14:23:41 +0000 |
| commit | a70b5fd2a85b7c51051f5c63788c9a5f70388335 (patch) | |
| tree | 897dd5fd8d6fda347f07b7359757dd54333e3ffe | |
| parent | bdae3ca18d01799cc7c6e15e984a2075d769546b (diff) | |
Specify default xkb rules for Xnest and Xephyr.
| -rw-r--r-- | kdrive/Makefile.bsd-wrapper | 3 | ||||
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kdrive/Makefile.bsd-wrapper b/kdrive/Makefile.bsd-wrapper index 968512d5f..498dbf113 100644 --- a/kdrive/Makefile.bsd-wrapper +++ b/kdrive/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2010/07/31 07:40:58 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2011/01/02 14:23:40 matthieu Exp $ .include <bsd.xconf.mk> @@ -7,6 +7,7 @@ _SRCDIR= ${.CURDIR}/../xserver CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/db/xkb \ + --with-default-xkb-rules=xorg \ --with-dri-driver-path=${LIBDIR}/modules/dri \ --enable-dri \ --disable-xorg \ diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 60170e8b3..566bb34bf 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.31 2011/01/02 14:04:18 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.32 2011/01/02 14:23:40 matthieu Exp $ .include <bsd.xconf.mk> @@ -34,6 +34,7 @@ DRI_OPTION= --disable-dri --disable-dri2 CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/db/xkb \ + --with-default-xkb-rules=xorg \ --with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \ --enable-install-setuid --enable-privsep \ --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \ |