From: Stefan Weil <sw@weilnetz.de>
Date: Fri, 5 Jul 2013 20:55:43 +0000 (+0200)
Subject: po/Makefile: Fix generation of messages.po
X-Git-Tag: v1.6.0-rc0~91
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1fa449231832d0fb7f20a3d7ecd06190ce906529;p=users%2Fdwmw2%2Fqemu.git

po/Makefile: Fix generation of messages.po

* Tell xgettext that we use UTF-8 encoding (this is currently optional).

* Set charset=UTF-8 in messages.po. This avoids warnings from msgmerge:
  warning: Charset "CHARSET" is not a portable encoding name.

* Use filename relative to root directory (ui/gtk.c instead of ../ui/gtk.c
  or $(SRC_PATH)/ui/gtk.c) for comments in *.po files.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/po/Makefile b/po/Makefile
index 0e345b004e..a6ab4825fa 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -36,7 +36,11 @@ install: $(OBJS)
 	@msgfmt -o $@ $<
 
 $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
-	@xgettext -o $@ --foreign-user --package-name=QEMU --package-version=$(VERSION) --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
+	@cd $(SRC_PATH) && \
+	 (xgettext -o - --from-code=UTF-8 --foreign-user \
+	    --package-name=QEMU --package-version=$(VERSION) \
+	    --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
+	  sed -e s/CHARSET/UTF-8/) >$@
 
 $(PO_PATH)/%.po: $(PO_PATH)/messages.po
 	@msgmerge $@ $< > $@.bak && mv $@.bak $@