From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvD2k-0003tD-R1 for qemu-devel@nongnu.org; Fri, 05 Jul 2013 16:55:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvD2j-0005yK-QG for qemu-devel@nongnu.org; Fri, 05 Jul 2013 16:55:50 -0400 Received: from qemu.weilnetz.de ([37.221.198.45]:35261 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvD2j-0005x0-KM for qemu-devel@nongnu.org; Fri, 05 Jul 2013 16:55:49 -0400 From: Stefan Weil Date: Fri, 5 Jul 2013 22:55:42 +0200 Message-Id: <1373057744-20278-3-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 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds (regression) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Stefan Weil , qemu-devel , Aurelien Jarno 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 --- po/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/po/Makefile b/po/Makefile index 2c5b202..0e345b0 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 -- 1.7.10.4