From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Colin Xu <colin.xu@intel.com>
Cc: qemu-devel@nongnu.org, kraxel@redhat.com
Subject: Re: [Qemu-devel] [PATCH] ui: Correct icon install path
Date: Tue, 25 Jun 2019 11:42:46 +0100 [thread overview]
Message-ID: <20190625104246.GD3139@redhat.com> (raw)
In-Reply-To: <20190625032142.13854-1-colin.xu@intel.com>
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.xu@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é <berrange@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 :|
next prev parent reply other threads:[~2019-06-25 10:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 3:21 [Qemu-devel] [PATCH] ui: Correct icon install path Colin Xu
2019-06-25 10:42 ` Daniel P. Berrangé [this message]
2019-06-25 13:40 ` Eric Blake
2019-06-26 0:52 ` Colin Xu
2019-06-25 10:43 ` Philippe Mathieu-Daudé
2019-06-26 0:48 ` Colin Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190625104246.GD3139@redhat.com \
--to=berrange@redhat.com \
--cc=colin.xu@intel.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).