summaryrefslogtreecommitdiff
path: root/package/xkeyboard-config
diff options
context:
space:
mode:
Diffstat (limited to 'package/xkeyboard-config')
-rw-r--r--package/xkeyboard-config/Config.in6
-rw-r--r--package/xkeyboard-config/Makefile12
2 files changed, 5 insertions, 13 deletions
diff --git a/package/xkeyboard-config/Config.in b/package/xkeyboard-config/Config.in
deleted file mode 100644
index 2abb16055..000000000
--- a/package/xkeyboard-config/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XKEYBOARD_CONFIG
- prompt "xkeyboard-config............................ X keyboard config"
- tristate
- default n
- help
- http://www.x.org
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 41f4fa786..7f5f258f4 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -4,9 +4,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xkeyboard-config
-PKG_VERSION:= 1.6
+PKG_VERSION:= 1.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 889e6e10eb7449bf33a5423c40369da5
+PKG_BUILDDEP+= xkbcomp
+PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163
PKG_DESCR:= X keyboard config
PKG_SECTION:= x11
PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/
@@ -15,13 +16,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
-
post-install:
${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
- ${CP} ${WRKINST}/usr/share/X11/xkb/* ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
+ ${CP} ${WRKINST}/usr/share/X11/xkb/* \
+ ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.lst
rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.xml
rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr