Enable bridge, disable wifi

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 681af85..74544bc 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=zlib
 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_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,6 +34,7 @@ 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 \
@@ -61,13 +62,12 @@ define Build/InstallDev
 endef
        
 define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/z{conf,lib}.h \
+       rm -rf  $(STAGING_DIR)/usr/include/z{conf,lib}.h \
                $(STAGING_DIR)/usr/lib/libz.{a,so*}
 endef
 
 define Package/zlib/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
 endef