2 files changed, 25 insertions, 7 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 09abb891d11f..2fcb244a9e18 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -27,8 +27,20 @@ update-po-config: $(obj)/kxgettext
         xgettext --default-domain=linux \
           --add-comments --keyword=_ --keyword=N_ \
           --files-from=scripts/kconfig/POTFILES.in \
-        -o scripts/kconfig/linux.pot
-        scripts/kconfig/kxgettext arch/$(ARCH)/Kconfig >> scripts/kconfig/linux.pot
+          --output scripts/kconfig/config.pot
+        $(Q)ln -fs Kconfig_i386 arch/um/Kconfig_arch
+        $(Q)for i in `ls arch/`; \
+        do \
+          scripts/kconfig/kxgettext arch/$$i/Kconfig \
+            | msguniq -o scripts/kconfig/linux_$${i}.pot; \
+        done
+        $(Q)msgcat scripts/kconfig/config.pot \
+          `find scripts/kconfig/ -type f -name linux_*.pot` \
+          --output scripts/kconfig/linux_raw.pot
+        $(Q)msguniq --sort-by-file scripts/kconfig/linux_raw.pot \
+            --output scripts/kconfig/linux.pot
+        $(Q)rm -f arch/um/Kconfig_arch
+        $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot
 
 .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
 
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index 1c88d7c6d5a7..abee55ca6174 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -14,6 +14,11 @@ static char *escape(const char* text, char *bf, int len)
 {
         char *bfp = bf;
         int multiline = strchr(text, '\n') != NULL;
+        int eol = 0;
+        int textlen = strlen(text);
+
+        if ((textlen > 0) && (text[textlen-1] == '\n'))
+                eol = 1;
 
         *bfp++ = '"';
         --len;
@@ -43,7 +48,7 @@ next:
                 --len;
         }
 
-        if (multiline)
+        if (multiline && eol)
                 bfp -= 3;
 
         *bfp++ = '"';
@@ -179,7 +184,11 @@ static void message__print_file_lineno(struct message *self)
 {
         struct file_line *fl = self->files;
 
-        printf("\n#: %s:%d", fl->file, fl->lineno);
+        putchar('\n');
+        if (self->option != NULL)
+                printf("# %s:00000\n", self->option);
+
+        printf("#: %s:%d", fl->file, fl->lineno);
         fl = fl->next;
 
         while (fl != NULL) {
@@ -187,9 +196,6 @@ static void message__print_file_lineno(struct message *self)
                 fl = fl->next;
         }
 
-        if (self->option != NULL)
-                printf(", %s:00000", self->option);
-
         putchar('\n');
 }