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 /app/setxkbmap/Makefile.bsd-wrapper | |
| 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 'app/setxkbmap/Makefile.bsd-wrapper')
| -rw-r--r-- | app/setxkbmap/Makefile.bsd-wrapper | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/setxkbmap/Makefile.bsd-wrapper b/app/setxkbmap/Makefile.bsd-wrapper index 5d4da5f35..be2924aa8 100644 --- a/app/setxkbmap/Makefile.bsd-wrapper +++ b/app/setxkbmap/Makefile.bsd-wrapper @@ -1,5 +1,12 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/01/01 17:10:08 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2011/03/08 07:59:23 matthieu Exp $ +.include <bsd.xconf.mk> -CONFIGURE_ARGS= --with-xkb-config-root=$(X11ETC)/xkb +.if ${XENOCARA_USE_XKEYBOARD_CONFIG:L} == "yes" +CONFIGURE_ARGS= --with-xkb-config-root=${X11BASE}/share/X11/xkb \ + --with-xkb-default-rules=base +.else +CONFIGURE_ARGS= --with-xkb-config-root=$(X11ETC)/xkb \ + --with-xkb-default-rules=xorg +.endif .include <bsd.xorg.mk> |