From c12c40f4a65efb0a0c070fe914c6552dbf2f22d1 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 18 Jun 2006 18:30:40 +0000
Subject: normalize Makefiles.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3998 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/zlib/Makefile | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'package/zlib')

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 33cbcceb27..02659bb9ac 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -8,8 +8,7 @@ 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
 
@@ -47,27 +46,23 @@ define Build/Compile
 		install
 endef
 
-define Package/zlib/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/zconf.h \
-		$(PKG_INSTALL_DIR)/usr/include/zlib.h \
+	$(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/libz.a \
-		$(PKG_INSTALL_DIR)/usr/lib/libz.so* \
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
 		$(STAGING_DIR)/usr/lib/
 endef
 	
 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*
+	rm -rf	$(STAGING_DIR)/usr/include/z{conf,lib}.h \
+		$(STAGING_DIR)/usr/lib/libz.{a,so*}
+endef
+
+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))
-- 
cgit v1.2.3