From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 18 Apr 2005 06:37:11 +0000 (+0000)
Subject: Uniformize package Makefile, move ipkg related files to ./ipkg and patches to ./patches
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=4b578a092831613bd23ec687944e627842699c87;ds=sidebyside

Uniformize package Makefile, move ipkg related files to ./ipkg and patches to ./patches


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@666 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 5e05915e2..501b13798 100644
--- a/package/zlib/Makefile
+++ b/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/package/zlib/zlib.control b/package/zlib/ipkg/zlib.control
similarity index 100%
rename from package/zlib/zlib.control
rename to package/zlib/ipkg/zlib.control
diff --git a/package/zlib/zlib.patch b/package/zlib/patches/zlib.patch
similarity index 100%
rename from package/zlib/zlib.patch
rename to package/zlib/patches/zlib.patch