From 6970a921588681a8e797a96d1e3a1a332b3f92ab Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 15 Feb 2005 22:48:08 +0000
Subject: give uclibc and busybox config files consistant variable names

---
 toolchain/uClibc/uclibc.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'toolchain')

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index d104ce145..5d4b0a6a2 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -4,6 +4,12 @@
 #
 #############################################################
 
+ifeq ($(BR2_ENABLE_LOCALE),y)
+UCLIBC_CONFIG_FILE:=toolchain/uClibc/uClibc.config-locale
+else
+UCLIBC_CONFIG_FILE:=toolchain/uClibc/uClibc.config
+endif
+
 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 # Be aware that this changes daily....
 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc
@@ -44,11 +50,7 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
-ifeq ($(BR2_ENABLE_LOCALE),y)
-	cp toolchain/uClibc/uClibc.config-locale $(UCLIBC_DIR)/.config
-else
-	cp toolchain/uClibc/uClibc.config $(UCLIBC_DIR)/.config
-endif
+	cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
 	$(SED) 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
 		$(UCLIBC_DIR)/.config
 	$(SED) 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' $(UCLIBC_DIR)/.config
-- 
cgit v1.2.3