oops... wrong patch (unfixed typo)

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 33cbcce..066a399 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -1,3 +1,9 @@
+# 
+# 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
 # $Id$
 
 include $(TOPDIR)/rules.mk


@@ -6,23 +12,17 @@ PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
 PKG_RELEASE:=3
 
 PKG_VERSION:=1.2.3
 PKG_RELEASE:=3
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=http://www.zlib.net \
-       @SF/zlib
+PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib

 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6

-PKG_CAT:=bzcat

 
 

-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk

 
 define Package/zlib
 
 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
 endef
 
 define Build/Configure


@@ -30,9 +30,10 @@ define Build/Configure
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \

+               UNAME_S="Linux" \

                ./configure \
                ./configure \

-               --prefix=/usr \
-               --shared \
+                       --prefix=/usr \
+                       --shared \

        );
 endef
 
        );
 endef
 


@@ -47,27 +48,23 @@ define Build/Compile
                install
 endef
 
                install
 endef
 

-define Package/zlib/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
-endef
-

 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include

-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/zconf.h \
-               $(PKG_INSTALL_DIR)/usr/include/zlib.h \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \

                $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
                $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib

-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.a \
-               $(PKG_INSTALL_DIR)/usr/lib/libz.so* \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \

                $(STAGING_DIR)/usr/lib/
 endef
        
 define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/
 endef
        
 define Build/UninstallDev

-       rm -rf  $(STAGING_DIR)/usr/include/zconf.h \
-               $(STAGING_DIR)/usr/include/zlib.h \
-               $(STAGING_DIR)/usr/lib/libz.a \
-               $(STAGING_DIR)/usr/lib/libz.so*
+       rm -rf  $(STAGING_DIR)/usr/include/z{conf,lib}.h \
+               $(STAGING_DIR)/usr/lib/libz.{a,so*}
+endef
+
+define Package/zlib/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,zlib))
 endef
 
 $(eval $(call BuildPackage,zlib))