X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/eba2615957cfb1c51d90d8d17caaeb83917434f8..2cb5343fc18be5153b476147c0f3fd142cb36cba:/package/zlib/Makefile?ds=inline

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index d3c8714ba..6c560624f 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -8,19 +8,17 @@ 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_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_CAT:=bzcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.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/
@@ -48,23 +46,23 @@ define Build/Compile
 		install
 endef
 
-define Package/zlib/install
-	install -m0755 -d $(IDIR_ZLIB)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/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/z{conf,lib}.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,so*} \
+		$(STAGING_DIR)/usr/lib/
+endef
 	
-install-dev: $(STAGING_DIR)/usr/lib/libz.so
+define Build/UninstallDev
+	rm -rf	$(STAGING_DIR)/usr/include/z{conf,lib}.h \
+		$(STAGING_DIR)/usr/lib/libz.{a,so*}
+endef
 
-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 Package/zlib/install
+	install -m0755 -d $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
+endef
 
 $(eval $(call BuildPackage,zlib))