From e3b6b2c1a6eed2b6369223cf4c83aa296a2edb5b Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 18 Apr 2005 06:37:11 +0000
Subject: [PATCH] Uniformize package Makefile, move ipkg related files to
 ./ipkg and patches to ./patches

SVN-Revision: 666
---
 openwrt/package/zlib/Makefile                 | 12 ++++++------
 openwrt/package/zlib/{ => ipkg}/zlib.control  |  0
 openwrt/package/zlib/{ => patches}/zlib.patch |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename openwrt/package/zlib/{ => ipkg}/zlib.control (100%)
 rename openwrt/package/zlib/{ => patches}/zlib.patch (100%)

diff --git a/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile
index 5e05915e210..501b1379830 100644
--- a/openwrt/package/zlib/Makefile
+++ b/openwrt/package/zlib/Makefile
@@ -24,7 +24,7 @@ $(DL_DIR)/$(PKG_SOURCE):
 
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
 	touch $(PKG_BUILD_DIR)/.prepared
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
@@ -49,9 +49,9 @@ $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
 		install
 
 $(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_ZLIB)/usr/lib
-	cp -a $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+	cp -fpR $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
 	$(STRIP) $(IDIR_ZLIB)/usr/lib/lib*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
@@ -65,7 +65,7 @@ compile: $(IPKG_ZLIB)
 install: $(INFO_ZLIB)
 
 clean:
-	-$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(STAGING_DIR)" \
-		uninstall
+	rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h
+	rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*}
+	rm -rf $(STAGING_DIR)/usr/share/man/man*/zlib.*
 	rm -rf $(PKG_BUILD_DIR) $(IPKG_ZLIB)
diff --git a/openwrt/package/zlib/zlib.control b/openwrt/package/zlib/ipkg/zlib.control
similarity index 100%
rename from openwrt/package/zlib/zlib.control
rename to openwrt/package/zlib/ipkg/zlib.control
diff --git a/openwrt/package/zlib/zlib.patch b/openwrt/package/zlib/patches/zlib.patch
similarity index 100%
rename from openwrt/package/zlib/zlib.patch
rename to openwrt/package/zlib/patches/zlib.patch