aboutsummaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-07-05 22:55:42 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-23 15:45:23 -0500
commit00134a62039a12822cda91310131cc050f78cf9b (patch)
treecb283820fd242496f68efe0ec9f96683c13d7316 /po
parent18e12d49edd4417a93f875e122652bd22aabad79 (diff)
downloadqemu-arm-00134a62039a12822cda91310131cc050f78cf9b.tar.gz
po/Makefile: Fix *.mo generation for out-of-tree builds (regression)
Commit f84756554e32d97db3aa949db1dd58c7eea62375 added a wildcard search for *.po files. This search found no files for out of tree builds, so those builds no longer created and installed *.mo files. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'po')
-rw-r--r--po/Makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/po/Makefile b/po/Makefile
index 2c5b202730..0e345b004e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,15 +1,18 @@
# 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 or use 'make build'"
@@ -30,12 +33,12 @@ install: $(OBJS)
done
%.mo: %.po
- @msgfmt -o $@ $(SRC_PATH)/po/`basename $@ .mo`.po
+ @msgfmt -o $@ $<
-messages.po: $(SRC_PATH)/ui/gtk.c
+$(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 $<
-%.po: messages.po
+$(PO_PATH)/%.po: $(PO_PATH)/messages.po
@msgmerge $@ $< > $@.bak && mv $@.bak $@
.PHONY: clean all