diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-03-08 07:59:24 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-03-08 07:59:24 +0000 |
| commit | e3a3855ef99aac36d1c9dd930ab403ef96c040d1 (patch) | |
| tree | 43df73b2e7f865ece0566ba1399277c8243e9f21 /kdrive | |
| parent | e4d327ce931c7ff0281739348aa9ca23e109a578 (diff) | |
add a new build switch 'XENOCARA_USE_XKEYBOARD_CONFIG' to enable
the use of xkeyboard-config xkb definitions instead of the old xkbdata.
This will make testing easier. No changes in default builds.
ok shadchin@
Diffstat (limited to 'kdrive')
| -rw-r--r-- | kdrive/Makefile.bsd-wrapper | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kdrive/Makefile.bsd-wrapper b/kdrive/Makefile.bsd-wrapper index 498dbf113..d3235bef5 100644 --- a/kdrive/Makefile.bsd-wrapper +++ b/kdrive/Makefile.bsd-wrapper @@ -1,13 +1,21 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2011/01/02 14:23:40 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2011/03/08 07:59:23 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 +.else +XKB_PATH= /etc/X11/xkb +XKB_RULES= xorg +.endif + CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ - --with-xkb-path=/etc/X11/xkb \ + --with-xkb-path=${XKB_PATH} \ --with-xkb-output=/var/db/xkb \ - --with-default-xkb-rules=xorg \ + --with-default-xkb-rules=${XKB_RULES} \ --with-dri-driver-path=${LIBDIR}/modules/dri \ --enable-dri \ --disable-xorg \ |