X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b406bcc62e9d93fa4b4d04076cb0776c3deed527..002c3c665289b52eb20fd899fd3561e7f9d9e073:/package/zlib/Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 19457c1ac..ecbfcd084 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
-PKG_VERSION:=1.2.3
-PKG_RELEASE:=5
+PKG_VERSION:=1.2.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
-PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
+PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
+PKG_MD5SUM:=be1e89810e66150f5b0327984d8625a0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,18 +29,18 @@ define Build/Configure
 		$(TARGET_CONFIGURE_OPTS) \
 		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
 		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-		UNAME_S="Linux" \
 		./configure \
 			--prefix=/usr \
 			--shared \
+			--uname=Linux \
 	);
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-		libz.a libz.so
+		CFLAGS="$(TARGET_CFLAGS)" \
+		libz.a libz.so.$(PKG_VERSION)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -54,6 +54,9 @@ define Build/InstallDev
 	mkdir -p $(1)/usr/lib
 	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
 		$(1)/usr/lib/
+	mkdir -p $(1)/usr/lib/pkgconfig
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
+		$(1)/usr/lib/pkgconfig/
 endef
 
 # libz.so is needed for openssl (zlib-dynamic)