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 0e345b004e91c61e8e940ad431b0cef2486462a9..a6ab4825fa9bd9dff531a0660c696cde89a56c73 100644 (file)
--- 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 $@