[v2,for-2.12] Makefile: install gtk message catalogs if CONFIG_GTK=y too, not only =m

Message ID 20180416093719.2543-1-mjt@msgid.tls.msk.ru
State New
Headers show
Series
  • [v2,for-2.12] Makefile: install gtk message catalogs if CONFIG_GTK=y too, not only =m
Related show

Commit Message

Michael Tokarev April 16, 2018, 9:37 a.m.
Fixes 722cd7496474cebb2218f21e038592fad8603365

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé April 16, 2018, 10:04 a.m. | #1
On 04/16/2018 06:37 AM, Michael Tokarev wrote:
> Fixes 722cd7496474cebb2218f21e038592fad8603365
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 727ef118f3..d71dd5bea4 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)
> +ifdef CONFIG_GTK
>  	$(MAKE) -C po $@
>  endif
>  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
>
Peter Maydell April 16, 2018, 5:40 p.m. | #2
On 16 April 2018 at 10:37, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Fixes 722cd7496474cebb2218f21e038592fad8603365
>
> 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..d71dd5bea4 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)
> +ifdef CONFIG_GTK
>         $(MAKE) -C po $@
>  endif
>         $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
> --
> 2.11.0

Applied, thanks.

-- PMM

Patch

diff --git a/Makefile b/Makefile
index 727ef118f3..d71dd5bea4 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)
+ifdef CONFIG_GTK
 	$(MAKE) -C po $@
 endif
 	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"