diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:44:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:44:59 +0200 |
| commit | b803209ad0f1f198072695109b30a726e0411084 (patch) | |
| tree | 3d5db865a71f72457d05fbe37cb25e96d67484f8 /package/zlib/Makefile | |
| parent | faf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff) | |
fat commit to add support for firefox on ibm x40 via usb stick
- add support for IBM X40 notebook
- add USB boot support
- add firefox package
- update and add all dependencies for firefox
- add xorg intel driver
- add dri support for xorg
Diffstat (limited to 'package/zlib/Makefile')
| -rw-r--r-- | package/zlib/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index e031baf0a..a31ca4af2 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= zlib -PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 6 -PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6 +PKG_VERSION:= 1.2.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 763c6a0b4ad1cdf5549e3ab3f140f4cb PKG_DESCR:= implementation of the deflate compression method PKG_SECTION:= libs PKG_URL:= http://www.zlib.net @@ -24,6 +24,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_ZLIB_DEV}+= zlib-dev-install + CONFIG_STYLE:= manual ifeq ($(ADK_NATIVE),) @@ -34,20 +38,22 @@ ifeq ($(ADK_STATIC),) CONFIGURE_OPTS:= --shared endif +#--includedir=$(STAGING_DIR)/usr/include do-configure: (cd $(WRKBUILD); $(COPTS) \ CFLAGS="$(TARGET_CFLAGS) -fPIC" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ./configure \ - --prefix=$(STAGING_DIR)/usr \ - --includedir=$(STAGING_DIR)/usr/include \ + --prefix=/usr \ $(CONFIGURE_OPTS) \ ); -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib + +zlib-dev-install: ${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include ${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include |