more tristate -> prompt fixes

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 95f6ce9..099ac03 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.2
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.2

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
 
 PKG_SOURCE_URL:=@SF/zlib
 PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
 
 PKG_SOURCE_URL:=@SF/zlib


@@ -18,16 +18,18 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \

+               LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \

                ./configure \
                --prefix=/usr \
                --shared \
        );
        touch $@
 
                ./configure \
                --prefix=/usr \
                --shared \
        );
        touch $@
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \


@@ -46,16 +48,17 @@ $(IPKG_ZLIB):
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h $(STAGING_DIR)/usr/include
+       cp -fpR $(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/libz.{a,so*} $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib

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

-       rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h
-       rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*}
+       rm -rf $(STAGING_DIR)/usr/include/zconf.h
+       rm -rf $(STAGING_DIR)/usr/include/zlib.h
+       rm -rf $(STAGING_DIR)/usr/lib/libz.*

 
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev