add a default for PKG_BUILD_DIR and PKG_INSTALL_DIR (will use KERNEL_BUILD_DIR if...

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index df4a475..d16c79d 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_CAT:=bzcat
 
 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
 
 define Package/zlib
 include $(INCLUDE_DIR)/package.mk
 
 define Package/zlib


@@ -34,6 +31,7 @@ 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 \
                        --prefix=/usr \
                        --shared \
                ./configure \
                        --prefix=/usr \
                        --shared \


@@ -66,7 +64,7 @@ define Build/UninstallDev
 endef
 
 define Package/zlib/install
 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
 
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
 endef