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/libXaw | |
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/libXaw')
-rw-r--r-- | package/libXaw/Config.in | 6 | ||||
-rw-r--r-- | package/libXaw/Makefile | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/package/libXaw/Config.in b/package/libXaw/Config.in deleted file mode 100644 index 713a26ab9..000000000 --- a/package/libXaw/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_LIBXAW - prompt "libXaw................................. X library" - tristate - default n - help - http://www.x.org diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index 52c444ced..9b6481da8 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -4,9 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXaw -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= d27375737f323849cf7ca2fa8566afa5 +PKG_BUILDDEP+= libXext libXmu libXpm +PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a PKG_DESCR:= X11 Athena Widget library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,12 +16,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_ARGS+= --disable-docs post-install: ${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXaw.so* ${IDIR_LIBXAW}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libXaw?.so* ${IDIR_LIBXAW}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk |