On Tue, Jun 25, 2019 at 11:21:42AM +0800, Colin Xu wrote:
> The double slash in path will fail the installation on MINGW/MSYS.
>
> Fixes: a8260d387638 (ui: install logo icons to $prefix/share/icons)
>
> Signed-off-by: Colin Xu <colin...@intel.com>
> ---
> Makefile | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
Hmmm I swear this exact fix has been posted before but I can't find
/ remember where and obviously it didnt get merged.
>
> diff --git a/Makefile b/Makefile
> index cfb18f152544..562205be290c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -875,19 +875,19 @@ ifneq ($(DESCS),)
> done
> endif
> for s in $(ICON_SIZES); do \
> - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \
> + mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
> $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
> -
> "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
> +
> "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
> done; \
> - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \
> + mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \
> $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \
> - "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
> - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \
> + "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
> + mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \
> $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
> - "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
> - mkdir -p "$(DESTDIR)/$(qemu_desktopdir)"
> + "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
> + mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
> $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
> - "$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop"
> + "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
> ifdef CONFIG_GTK
> $(MAKE) -C po $@
> endif
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
