Skip to content

Commit

Permalink
po: fix conflict with %.mo rule in rules.mak
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bonzini committed Sep 26, 2014
1 parent 5a6e8ba commit a697d24
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions po/Makefile
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit a697d24

Please sign in to comment.