diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/zlib/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/zlib/Makefile')
| -rw-r--r-- | package/zlib/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index c63f92b63..4e3cc79cb 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= zlib PKG_VERSION:= 1.2.3 PKG_RELEASE:= 5 PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6 -MASTER_SITES:= http://www.zlib.net/ \ +PKG_DESCR:= implementation of the deflate compression method (library) +PKG_SECTION:= libs +PKG_URL:= http://www.zlib.net +PKG_SITES:= http://www.zlib.net/ \ ${MASTER_SITE_SOURCEFORGE:=zlib/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= manual BUILD_STYLE= auto @@ -35,6 +39,6 @@ do-configure: post-install: ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib - cd ${WRKBUILD} && ${CP} libz.so* ${IDIR_ZLIB}/usr/lib + ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |