diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-22 16:19:05 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-26 13:35:08 +0200 |
commit | a697d240ff0f913da3f8cf082ed49acceccdd569 (patch) | |
tree | a87246433ff30e2016968728eeae453743a7ce5f | |
parent | 5a6e8ba64fb236068fef0f2ce26fe6579cf6a75c (diff) |
po: fix conflict with %.mo rule in rules.mak
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 <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | po/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/po/Makefile b/po/Makefile index 1ab241a5b7..b271f79ba2 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 \ |