X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0b0afa4d818ec18187b09055fbb8d84a01590d6e..271fe72913eccc9a113c3fc3320cb5144be4871c:/package/zlib/Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 6c560624f..293462528 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -1,27 +1,28 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
-PKG_CAT:=bzcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/zlib
-SECTION:=base
-CATEGORY:=Libraries
-TITLE:=Library implementing the deflate compression method
-DESCRIPTION:=A library implementing the 'deflate' compression method
-URL:=http://www.zlib.net/
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library implementing the deflate compression method
+  URL:=http://www.zlib.net/
 endef
 
 define Build/Configure
@@ -29,9 +30,10 @@ define Build/Configure
 		$(TARGET_CONFIGURE_OPTS) \
 		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
 		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		UNAME_S="Linux" \
 		./configure \
-		--prefix=/usr \
-		--shared \
+			--prefix=/usr \
+			--shared \
 	);
 endef
 
@@ -47,21 +49,23 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
+	mkdir -p $(1)/usr/include
 	$(CP)	$(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \
-		$(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
+		$(1)/usr/include/
+	mkdir -p $(1)/usr/lib
 	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
-		$(STAGING_DIR)/usr/lib/
+		$(1)/usr/lib/
 endef
 	
 define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/z{conf,lib}.h \
-		$(STAGING_DIR)/usr/lib/libz.{a,so*}
+	rm -rf	$(1)/usr/include/z{conf,lib}.h \
+		$(1)/usr/lib/libz.{a,so*}
 endef
 
+# libz.so is needed for openssl (zlib-dynamic)
 define Package/zlib/install
-	install -m0755 -d $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
 endef