Message ID | 20180414142739.23375-1-mjt@msgid.tls.msk.ru |
---|---|
State | New |
Headers | show |
Series | [trivial,for-2.12] Makefile: install gtk message catalogs if CONFIG_GTK=y too, not only =m | expand |
Hi Michael, On 04/14/2018 11:27 AM, Michael Tokarev wrote: > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 727ef118f3..8644c2e918 100644 > --- a/Makefile > +++ b/Makefile > @@ -856,7 +856,7 @@ ifneq ($(BLOBS),) > $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ > done > endif > -ifeq ($(CONFIG_GTK),m) > +ifneq ($(filter $(CONFIG_GTK),y m),) Or simply: ifdef CONFIG_GTK > $(MAKE) -C po $@ > endif > $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" > Regards, Phil.
On 14 April 2018 at 15:27, Michael Tokarev <mjt@tls.msk.ru> wrote: > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 727ef118f3..8644c2e918 100644 > --- a/Makefile > +++ b/Makefile > @@ -856,7 +856,7 @@ ifneq ($(BLOBS),) > $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ > done > endif > -ifeq ($(CONFIG_GTK),m) > +ifneq ($(filter $(CONFIG_GTK),y m),) > $(MAKE) -C po $@ > endif > $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" > -- > 2.11.0 "trivial" and "for 2.12" don't make much sense together at this point in the release cycle. Is this important enough to go into rc4, or not? thanks -- PMM
16.04.2018 12:26, Peter Maydell wrote: > On 14 April 2018 at 15:27, Michael Tokarev <mjt@tls.msk.ru> wrote: >> -ifeq ($(CONFIG_GTK),m) >> +ifneq ($(filter $(CONFIG_GTK),y m),) >> $(MAKE) -C po $@ >> endif > "trivial" and "for 2.12" don't make much sense together at this point in > the release cycle. Is this important enough to go into rc4, or not? Well, without this, gtk translations wont be installed. Not a huge issue, especially for the languages where qemu lacks translations, but I still think it is important enough to go to 2.12, or else it'll be a regression. I've just sent another, simpler version of the same thing. Thanks, /mjt
diff --git a/Makefile b/Makefile index 727ef118f3..8644c2e918 100644 --- a/Makefile +++ b/Makefile @@ -856,7 +856,7 @@ ifneq ($(BLOBS),) $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif -ifeq ($(CONFIG_GTK),m) +ifneq ($(filter $(CONFIG_GTK),y m),) $(MAKE) -C po $@ endif $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)