diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/xkeyboard-config/Makefile | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/xkeyboard-config/Makefile')
| -rw-r--r-- | package/xkeyboard-config/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
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 |