From ad146e3f653935bd097ad35c49fa06c04c98de66 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Mon, 15 May 2006 23:13:49 +0000
Subject: more BR2_ / CONFIG_ patches

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3784 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Config.in |  4 ++--
 package/base-files/Makefile  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'package/base-files')

diff --git a/package/base-files/Config.in b/package/base-files/Config.in
index c278b272f1..1dd6ff5360 100644
--- a/package/base-files/Config.in
+++ b/package/base-files/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_LIBGCC
+config PACKAGE_LIBGCC
 	prompt "libgcc............................ GCC support library"
 	tristate
-	default m if CONFIG_DEVEL
+	default m if DEVEL
 	help
 	  GCC support library
 
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8517dcc685..90820cf91d 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,10 +6,10 @@ PKG_NAME:=base-files
 PKG_RELEASE:=6
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
-BOARD:=$(shell LANG=C grep ^BR2_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+BOARD:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
 	-e "s/.*_//"| tr "[:upper:]" "[:lower:]")
-KERNEL:=$(shell LANG=C grep ^BR2_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
-	-e "s/BR2_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
+KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+	-e "s/CONFIG_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
@@ -32,11 +32,11 @@ IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) 
 PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) 
 
-ifeq ($(BR2_PACKAGE_LIBGCC),y)
+ifeq ($(CONFIG_PACKAGE_LIBGCC),y)
 PACKAGES+=$(IPKG_LIBGCC)
 PACKAGES_INSTALL+=$(IPKG_LIBGCC)
 endif
-ifeq ($(BR2_PACKAGE_LIBGCC),m)
+ifeq ($(CONFIG_PACKAGE_LIBGCC),m)
 PACKAGES+=$(IPKG_LIBGCC)
 endif
 
-- 
cgit v1.2.3