allow building of kernel-specific stuff in package/ instead of target/linux/package...

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index d3c8714..33cbcce 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -20,7 +20,6 @@ include $(TOPDIR)/package/rules.mk
 define Package/zlib
 SECTION:=base
 CATEGORY:=Libraries
-DEFAULT:=n
 TITLE:=Library implementing the deflate compression method
 DESCRIPTION:=A library implementing the 'deflate' compression method
 URL:=http://www.zlib.net/
@@ -49,22 +48,26 @@ define Build/Compile
 endef
 
 define Package/zlib/install
-       install -m0755 -d $(IDIR_ZLIB)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+       install -m0755 -d $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
 endef
 
-$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/zconf.h \
+               $(PKG_INSTALL_DIR)/usr/include/zlib.h \
+               $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib
-       touch $(STAGING_DIR)/usr/lib/libz.so
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.a \
+               $(PKG_INSTALL_DIR)/usr/lib/libz.so* \
+               $(STAGING_DIR)/usr/lib/
+endef
        
-install-dev: $(STAGING_DIR)/usr/lib/libz.so
-
-uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/zconf.h
-       rm -rf $(STAGING_DIR)/usr/include/zlib.h
-       rm -rf $(STAGING_DIR)/usr/lib/libz.*
+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*
+endef
 
 $(eval $(call BuildPackage,zlib))