diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-30 21:15:34 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-30 21:15:34 +0000 |
| commit | a44ad52473f20dff65c36739dde07974609a5f54 (patch) | |
| tree | cc51e06a67eacc8725f4c07ed5bd7ce02ec00389 /app | |
| parent | 1cfc000cccbae9b36cbd23f01ccdfe9c5a18b684 (diff) | |
Switch to xkeyboard-config is done. Remove old xkbdata and unifdef it.
ok shadchin@
Diffstat (limited to 'app')
| -rw-r--r-- | app/setxkbmap/Makefile.bsd-wrapper | 7 | ||||
| -rw-r--r-- | app/xkbcomp/Makefile.bsd-wrapper | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/app/setxkbmap/Makefile.bsd-wrapper b/app/setxkbmap/Makefile.bsd-wrapper index be2924aa8..6d2851cd8 100644 --- a/app/setxkbmap/Makefile.bsd-wrapper +++ b/app/setxkbmap/Makefile.bsd-wrapper @@ -1,12 +1,7 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2011/03/08 07:59:23 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2011/08/30 21:15:30 matthieu Exp $ .include <bsd.xconf.mk> -.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> diff --git a/app/xkbcomp/Makefile.bsd-wrapper b/app/xkbcomp/Makefile.bsd-wrapper index 3784d1b34..ddf01cef8 100644 --- a/app/xkbcomp/Makefile.bsd-wrapper +++ b/app/xkbcomp/Makefile.bsd-wrapper @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2011/03/09 19:53:24 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2011/08/30 21:15:30 matthieu Exp $ .include <bsd.xconf.mk> -.if ${XENOCARA_USE_XKEYBOARD_CONFIG:L} != "yes" -CONFIGURE_ARGS= --datadir=/etc -.endif - .include <bsd.xorg.mk> |