From 5459a9c5e010ef0cab22037432ea9d4984c83d6b Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Fri, 28 Sep 2007 19:43:26 +0000
Subject: [PATCH] Cleanup cross toolchain admin, split uclibc-menuconfig into
 same + uclibc-update to avoid overwriting board support file

---
 Makefile                   | 2 +-
 target/linux/Makefile.in   | 2 +-
 toolchain/uClibc/uclibc.mk | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 30c70d4e6e..cb030252ee 100644
--- a/Makefile
+++ b/Makefile
@@ -422,7 +422,7 @@ endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 	cp $(shell find ./target/ -name $@) .config
 	-@$(MAKE) oldconfig
 
-configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
+configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
 
 cross: $(BASE_TARGETS)
 
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index c2fa75b82f..14d4e085ed 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -227,7 +227,7 @@ linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
 
 linux26-unpacked: $(LINUX26_DIR)/.patched
 
-linux26-config:	host-sed $(LINUX26_DIR)/.configured
+linux26-config: host-sed $(LINUX26_DIR)/.configured
 
 linux26-update:
 	cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 7fcef559fc..1dc238d21e 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -108,7 +108,7 @@ else
 UCLIBC_LOCALE_DATA=
 endif
 
-$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
+$(UCLIBC_DIR)/.unpacked: dirs host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
 	mkdir -p $(TOOL_BUILD_DIR)
 	rm -rf $(UCLIBC_DIR)
 	$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -366,7 +366,6 @@ uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config
 		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
 		HOSTCC="$(HOSTCC)" \
 		menuconfig && \
-	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \
 	touch -c $(UCLIBC_DIR)/.config
 
 
@@ -450,7 +449,7 @@ uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
 uclibc-update: uclibc-config
 	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
-uclibc-configured: $(UCLIBC_DIR)/.configured
+uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
 
 uclibc-configured-source: uclibc-source
 
-- 
2.30.2