From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 29 May 2006 01:29:46 +0000 (+0000)
Subject: use InstallDev/UninstallDev.
X-Git-Tag: reboot~30718^2~679
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6f9b5a61b996e3a9b4077ed70c7d788bfef601cc;p=openwrt%2Fopenwrt.git

use InstallDev/UninstallDev.

SVN-Revision: 3833
---

diff --git a/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile
index 56c0381f56..da9e6f4614 100644
--- a/openwrt/package/zlib/Makefile
+++ b/openwrt/package/zlib/Makefile
@@ -53,18 +53,22 @@ define Package/zlib/install
 	$(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))