From fe7805070989f6b5a6888a1f09cffeb48aeab2b3 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 31 May 2006 13:27:11 +0000
Subject: [PATCH] cleanup; change base-files build directory

SVN-Revision: 3858
---
 openwrt/package/base-files/Makefile | 22 ++++++++++------------
 openwrt/package/rules.mk            |  5 +++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 536857657f4..485ebddc3b5 100644
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -2,6 +2,16 @@
 
 include $(TOPDIR)/rules.mk
 
+ifneq ($(DUMP),1)
+include $(BUILD_DIR)/kernel.mk
+include $(TOPDIR)/target/linux/rules.mk
+TARGET:=-$(BOARD)-$(KERNEL)
+BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+endif
+
 PKG_NAME:=base-files
 PKG_RELEASE:=8
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
@@ -13,15 +23,6 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
-ifneq ($(DUMP),1)
-include $(BUILD_DIR)/kernel.mk
-include $(TOPDIR)/target/linux/rules.mk
-TARGET:=-$(BOARD)-$(KERNEL)
-
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
-endif
-
 CONFIG_PACKAGE_base-files$(TARGET):=CONFIG_PACKAGE_base-files
 
 define Package/base-files$(TARGET)
@@ -99,9 +100,6 @@ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	ln -sf /proc/mounts $(1)/etc/mtab
 	rm -f $(1)/var
 	ln -sf /tmp $(1)/var
-	-find $(1) -type d -name CVS | xargs rm -rf
-	-find $(1) -type d -name .svn | xargs rm -rf
-	-find $(1) -name '.#*' | xargs rm -f
 	mkdir -p $(1)/etc
 endef
 
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 50f03effae5..26b41969d9d 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -154,8 +154,9 @@ define BuildPackage
   $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
-	find $$(IDIR_$(1)) -name CVS | xargs rm -rf
-	find $$(IDIR_$(1)) -name .svn | xargs rm -rf
+	-find $$(IDIR_$(1)) -name CVS | xargs rm -rf
+	-find $$(IDIR_$(1)) -name .svn | xargs rm -rf
+	-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)