3a333345a6
Update to v4.2.0-rc3. Intent is to submit to Factory, and SLE-15-SP2 as well OBS-URL: https://build.opensuse.org/request/show/751303 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=513
30 lines
876 B
Diff
30 lines
876 B
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Wed, 23 Jan 2019 20:23:01 -0700
|
|
Subject: Conditionalize ui bitmap installation better
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
Makefile | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 52881cbb12e7d980e0ed51f21174..edc3de72e6a94ef0503da640bbfe 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -913,6 +913,7 @@ ifneq ($(DESCS),)
|
|
"$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
|
|
done
|
|
endif
|
|
+ifneq ($(or $(CONFIG_GTK),$(CONFIG_SDL)),)
|
|
for s in $(ICON_SIZES); do \
|
|
mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
|
|
$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
|
|
@@ -927,6 +928,7 @@ endif
|
|
mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
|
|
$(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
|
|
"$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
|
|
+endif
|
|
ifdef CONFIG_GTK
|
|
$(MAKE) -C po $@
|
|
endif
|