[Qemu-devel] [PATCH 3/4] po/Makefile: Fix generation of messages.po

[Stefan Weil]

* 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 <address@hidden>
---
 po/Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/po/Makefile b/po/Makefile
index 0e345b0..a6ab482 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) address@hidden -k_ -C $<
+       @cd $(SRC_PATH) && \
+        (xgettext -o - --from-code=UTF-8 --foreign-user \
+           --package-name=QEMU --package-version=$(VERSION) \
+           address@hidden -k_ -C ui/gtk.c | \
+         sed -e s/CHARSET/UTF-8/) >$@
 
 $(PO_PATH)/%.po: $(PO_PATH)/messages.po
        @msgmerge $@ $< > address@hidden && mv address@hidden $@
-- 
1.7.10.4