qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch XKB layouts to xkeyboard-config.

Browse Source 
Note: this moves xkb data files to /usr/X11R6/share/X11/xkb/
      /etc/X11/xkb can be removed.
Tested by many.
This commit is contained in:
matthieu 2011-06-02 17:01:59 +00:00
parent 3c48ff5d9e
commit d44ab1009a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/mk/bsd.xconf.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xconf.mk,v 1.18 2011/03/08 20:48:59 matthieu Exp $ # $OpenBSD: bsd.xconf.mk,v 1.19 2011/06/02 17:01:59 matthieu Exp $
# Shared libs? # Shared libs?
.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax" .if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax"
@ -19,4 +19,4 @@ XENOCARA_BUILD_PIXMAN?=yes
.endif .endif
# Build xkeyboard-config? # Build xkeyboard-config?
XENOCARA_USE_XKEYBOARD_CONFIG?=no XENOCARA_USE_XKEYBOARD_CONFIG?=yes

11
share/mk/bsd.xorg.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.36 2010/08/04 22:56:00 espie Exp $ -*- makefile -*- # $OpenBSD: bsd.xorg.mk,v 1.37 2011/06/02 17:01:59 matthieu Exp $ -*- makefile -*-
# #
# Copyright © 2006 Matthieu Herrb # Copyright © 2006 Matthieu Herrb
# #
@ -29,6 +29,9 @@ XSRCDIR?= /usr/xenocara
# Where to build # Where to build
XOBJDIR?= /usr/xobj XOBJDIR?= /usr/xobj
# For libtool replacement
PORTSDIR?= /usr/ports
# Where to install # Where to install
BINDIR?= ${X11BASE}/bin BINDIR?= ${X11BASE}/bin
LIBDIR= ${X11BASE}/lib LIBDIR= ${X11BASE}/lib
@ -64,6 +67,8 @@ AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
$(CONFIGURE_ENV) $(CONFIGURE_ENV)
LIBTOOL= ${PORTSDIR}/infrastructure/bin/libtool
## ##
## Default rules ## Default rules
## ##
@ -141,7 +146,7 @@ _lt_libs+=lib${_n:S/+/_/g:S/-/_/g:S/./_/g}_ltversion=${_v}
.if !target(all) .if !target(all)
all: config.status all: config.status
exec ${MAKE} ${_lt_libs} exec ${MAKE} LIBTOOL=${LIBTOOL} ${_lt_libs}
.endif .endif
@ -190,7 +195,7 @@ afterinstall:
. endif . endif
. if !target(realinstall) . if !target(realinstall)
realinstall: realinstall:
exec ${MAKE} ${_lt_libs} install exec ${MAKE} LIBTOOL=${LIBTOOL} ${_lt_libs} install
.endif .endif
install: maninstall install: maninstall
maninstall: afterinstall maninstall: afterinstall