[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak |
Date: |
Tue, 23 Sep 2014 12:32:34 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.8.0 |
On 09/22/2014 04:19 PM, Paolo Bonzini wrote:
> po/Makefile includes rules.mak to use the nice quiet-command macro.
> However, this also brings in a %.mo rule that breaks "make build".
> Put our own rule before the include, so that it has precedence.
>
> Reported-by: Christian Borntraeger <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
> ---
> po/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/po/Makefile b/po/Makefile
> index 1ab241a..b271f79 100644
> --- a/po/Makefile
> +++ b/po/Makefile
> @@ -9,6 +9,9 @@ all:
>
> .PHONY: all build clean install update
>
> +%.mo: %.po
> + $(call quiet-command, msgfmt -o $@ $<, " GEN $@")
> +
> -include ../config-host.mak
> include $(SRC_PATH)/rules.mak
>
> @@ -38,9 +41,6 @@ install: $(OBJS)
> $(INSTALL) -m644 $$obj
> $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
> done
>
> -%.mo: %.po
> - $(call quiet-command, msgfmt -o $@ $<, " GEN $@")
> -
> $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
> $(call quiet-command, ( cd $(SRC_PATH) && \
> xgettext -o - --from-code=UTF-8 --foreign-user \
>