From: Colin Xu <Colin.Xu@intel.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com
Subject: Re: [Qemu-devel] [PATCH] ui: Correct icon install path
Date: Wed, 26 Jun 2019 08:48:15 +0800 [thread overview]
Message-ID: <8813889d-d924-dea4-5df7-05adc0c4c2bc@intel.com> (raw)
In-Reply-To: <429635c3-8775-ed6d-e45b-6803a8847b88@redhat.com>
On 2019-06-25 18:43, Philippe Mathieu-Daudé wrote:
> Hi Colin,
>
> On 6/25/19 5:21 AM, 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(-)
>>
>> 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
>>
> I'm not sure about this. Did you test it on a POSIX system?
>
> Maybe we should escape an eventual trailing '/' in datadir and DESTDIR?
Hi Philippe,
Yes, tested. Actually the other DIR referened in the Makefile only use $(DESTDIR)$(bindir)
, $(DESTDIR)$(qemu_docdir), etc. So I guess the inconsistencie should be fixed.
Best Regards,
Colin Xu
prev parent reply other threads:[~2019-06-26 0:49 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é
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 [this message]
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=8813889d-d924-dea4-5df7-05adc0c4c2bc@intel.com \
--to=colin.xu@intel.com \
--cc=berrange@redhat.com \
--cc=kraxel@redhat.com \
--cc=philmd@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).