2.6.24

 scripts

 kconfig

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 8986a48..1ad6f7f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -4,23 +4,25 @@
 
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
 
+Kconfig := arch/$(SRCARCH)/Kconfig
+
 xconfig: $(obj)/qconf
-   $< arch/$(ARCH)/Kconfig
+   $< $(Kconfig)
 
 gconfig: $(obj)/gconf
-   $< arch/$(ARCH)/Kconfig
+   $< $(Kconfig)
 
 menuconfig: $(obj)/mconf
-   $< arch/$(ARCH)/Kconfig
+   $< $(Kconfig)
 
 config: $(obj)/conf
-   $< arch/$(ARCH)/Kconfig
+   $< $(Kconfig)
 
 oldconfig: $(obj)/conf
-   $< -o arch/$(ARCH)/Kconfig
+   $< -o $(Kconfig)
 
 silentoldconfig: $(obj)/conf
-   $< -s arch/$(ARCH)/Kconfig
+   $< -s $(Kconfig)
 
 # Create new linux.po file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
@@ -45,27 +47,27 @@ update-po-config: $(obj)/kxgettext
 PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
 
 randconfig: $(obj)/conf
-   $< -r arch/$(ARCH)/Kconfig
+   $< -r $(Kconfig)
 
 allyesconfig: $(obj)/conf
-   $< -y arch/$(ARCH)/Kconfig
+   $< -y $(Kconfig)
 
 allnoconfig: $(obj)/conf
-   $< -n arch/$(ARCH)/Kconfig
+   $< -n $(Kconfig)
 
 allmodconfig: $(obj)/conf
-   $< -m arch/$(ARCH)/Kconfig
+   $< -m $(Kconfig)
 
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
-   $< -d arch/$(ARCH)/Kconfig
+   $< -d $(Kconfig)
 else
-   @echo *** Default configuration is based on '$(KBUILD_DEFCONFIG)'
-   $(Q)$< -D arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) arch/$(ARCH)/Kconfig
+   @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+   $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 endif
 
 %_defconfig: $(obj)/conf
-   $(Q)$< -D arch/$(ARCH)/configs/$@ arch/$(ARCH)/Kconfig
+   $(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
 # Help text used by make help
 help:
@@ -84,7 +86,7 @@ help:
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
 
-# Use reursively expanded variables so we do not call gcc unless
+# Use recursively expanded variables so we do not call gcc unless
 # we really need to do so. (Do not call gcc as part of make mrproper)
 HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
 HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
@@ -143,14 +145,8 @@ clean-files   := lkc_defs.h qconf.moc .tmp_qtcheck \
          .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
 clean-files     += mconf qconf gconf
 
-# Needed for systems without gettext
-KBUILD_HAVE_NLS := $(shell \
-     if echo "\#include <libintl.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \
-     then echo yes ; \
-     else echo no ; fi)
-ifeq ($(KBUILD_HAVE_NLS),no)
-HOSTCFLAGS   += -DKBUILD_NO_NLS
-endif
+# Add environment specific flags
+HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
 
 # generated files seem to need this to find local include files
 HOSTCFLAGS_lex.zconf.o   := -I$(src)