do not fire up the qos-scripts hotplug part if the init script is disabled

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 41be6cc..15407d5 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -10,24 +10,19 @@ 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
@@ -35,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
 
@@ -66,8 +62,10 @@ define Build/UninstallDev
                $(STAGING_DIR)/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