po/Makefile: Fix generation of messages.po

[qemu.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index 60ccd7d3bb7aacd1be41bb3bc0642f8bf9f5338e..a6ab4825fa9bd9dff531a0660c696cde89a56c73 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,20 +1,22 @@
 # This makefile is very special as it's meant to build as part of the build
 # process and also within the source tree to update the translation files.
 
-VERSION=$(shell cat ../VERSION)
-SRCS=$(filter-out messages.po,$(wildcard *.po))
-OBJS=$(patsubst %.po,%.mo,$(SRCS))
-
+# Set SRC_PATH for in-tree builds without configuration.
 SRC_PATH=..
 
 -include ../config-host.mak
 
-vpath %.po $(SRC_PATH)/po
+PO_PATH=$(SRC_PATH)/po
+
+VERSION=$(shell cat $(SRC_PATH)/VERSION)
+SRCS=$(filter-out $(PO_PATH)/messages.po,$(wildcard $(PO_PATH)/*.po))
+OBJS=$(patsubst $(PO_PATH)/%.po,%.mo,$(SRCS))
+
+vpath %.po $(PO_PATH)
 
 all:
-       @echo Use 'make update' to update translation files
-       @echo or us 'make build' or 'make install' to build and install
-       @echo the translation files
+       @echo "Use 'make update' to update translation files or use 'make build'"
+       @echo "or 'make install' to build and install the translation files."
 
 update: $(SRCS)
 
@@ -31,12 +33,16 @@ install: $(OBJS)
        done
 
 %.mo: %.po
-       @msgfmt -o $@ $(SRC_PATH)/po/`basename $@ .mo`.po
+       @msgfmt -o $@ $<
 
-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 $<
+$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.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: messages.po
+$(PO_PATH)/%.po: $(PO_PATH)/messages.po
        @msgmerge $@ $< > $@.bak && mv $@.bak $@
 
 .PHONY: clean all