Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71448c1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4d18de94 fa0ad657

scripts/kconfig/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -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