summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-23 15:01:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-23 15:01:24 -0800
commit71448c1f4fd7c1b2bab766b3bf2b675cfe71b9ff (patch)
treed9935c529067afedb2aee4f64d7c03084fde8da6
parent4d18de944954b973fede3259d206022f90549269 (diff)
parentfa0ad6575f6d459e215dded90b10cc455a889145 (diff)
downloadlinux-71448c1f4fd7c1b2bab766b3bf2b675cfe71b9ff.tar.gz
linux-71448c1f4fd7c1b2bab766b3bf2b675cfe71b9ff.tar.bz2
linux-71448c1f4fd7c1b2bab766b3bf2b675cfe71b9ff.zip
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kconfig: adapt update-po-config to new UML layout
-rw-r--r--scripts/kconfig/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ba573fe7c74d..914833d99b06 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -60,8 +60,8 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
--directory=$(srctree) --directory=$(objtree) \
--output $(obj)/config.pot
$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
- $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
- $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`; \
+ $(Q)(for i in `ls $(srctree)/arch/*/Kconfig \
+ $(srctree)/arch/*/um/Kconfig`; \
do \
echo " GEN $$i"; \
$(obj)/kxgettext $$i \
@@ -69,7 +69,6 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
done )
$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
--output $(obj)/linux.pot
- $(Q)rm -f $(srctree)/arch/um/Kconfig
$(Q)rm -f $(obj)/config.pot
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig