update to newer version, fix compile issues, 100-wpa_fix.patch removed, is it needed?

[openwrt.git] / openwrt / package / zlib / Makefile

diff --git a/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile
index 099ac03..cfd8280 100644 (file)
--- a/openwrt/package/zlib/Makefile
+++ b/openwrt/package/zlib/Makefile
@@ -3,11 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib

-PKG_VERSION:=1.2.2
-PKG_RELEASE:=2
-PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=3
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6

 
 

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

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


@@ -42,15 +43,15 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_ZLIB):
        install -m0755 -d $(IDIR_ZLIB)/usr/lib
 
 $(IPKG_ZLIB):
        install -m0755 -d $(IDIR_ZLIB)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/

        $(RSTRIP) $(IDIR_ZLIB)
        $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_ZLIB)
        $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include

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

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib

        touch $(STAGING_DIR)/usr/lib/libz.so
        
 install-dev: $(STAGING_DIR)/usr/lib/libz.so
        touch $(STAGING_DIR)/usr/lib/libz.so
        
 install-dev: $(STAGING_DIR)/usr/lib/libz.so