0f796dd004
Update to v4.1.0. Also includes other major packaging changes as follows: There is a new package maintenance workflow - see README.PACKAGING for details. The sibling packages qemu-linux-user and qemu-testsuite are now created with the Build Service's MultiBuild feature. This also necessitates combining the qemu-linux-user changelog content back into qemu's. Luckily the delta there is quite small. Note that the qemu spec file is now that much busier, but added section markers should help reduce the confusion. Also qemu is being enabled for RISCV host compatibility, so some changes are related to that as well. OBS-URL: https://build.opensuse.org/request/show/730437 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=487
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 00ed716275743a161ea05e7d2a1e..ab4d8683ad8f86aa680b343310e1 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -887,6 +887,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 \
|
|
@@ -901,6 +902,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
|