From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvD2n-0003uq-Bx for qemu-devel@nongnu.org; Fri, 05 Jul 2013 16:55:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvD2k-00060m-UF for qemu-devel@nongnu.org; Fri, 05 Jul 2013 16:55:53 -0400 Received: from [2a03:4000:2:362::1] (port=46933 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvD2k-0005zh-OH for qemu-devel@nongnu.org; Fri, 05 Jul 2013 16:55:50 -0400 From: Stefan Weil Date: Fri, 5 Jul 2013 22:55:43 +0200 Message-Id: <1373057744-20278-4-git-send-email-sw@weilnetz.de> In-Reply-To: <1373057744-20278-1-git-send-email-sw@weilnetz.de> References: <1373057744-20278-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH 3/4] po/Makefile: Fix generation of messages.po List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Stefan Weil , qemu-devel , Aurelien Jarno * 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 --- 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) --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 $@ -- 1.7.10.4