summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-03-08 07:59:24 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-03-08 07:59:24 +0000
commite3a3855ef99aac36d1c9dd930ab403ef96c040d1 (patch)
tree43df73b2e7f865ece0566ba1399277c8243e9f21 /data
parente4d327ce931c7ff0281739348aa9ca23e109a578 (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 'data')
-rw-r--r--data/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/data/Makefile b/data/Makefile
index 7e81b4bdc..32b12a514 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,7 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2007/04/04 22:30:55 david Exp $
+# $OpenBSD: Makefile,v 1.5 2011/03/08 07:59:23 matthieu Exp $
# bitmaps needed for building apps, so has to be done separately first
+
+.include <bsd.xconf.mk>
+.if ${XENOCARA_USE_XKEYBOARD_CONFIG:L} == "yes"
+SUBDIR= xkeyboard-config
+.else
SUBDIR= xkbdata
+.endif
build: _SUBDIRUSE