* [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x
@ 2019-05-21 14:53 Stefan Hajnoczi
2019-05-21 15:00 ` Daniel P. Berrangé
2019-06-12 12:14 ` Stefan Hajnoczi
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2019-05-21 14:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Daniel P . Berrange, Stefan Hajnoczi
The GNU make manual[1] demonstrates $(DESTDIR)$(bindir)/foo and QEMU
mostly follows that. There are just a few instances of
$(DESTDIR)/$(bindir)/foo. Fix these inconsistencies.
[1] https://www.gnu.org/software/make/manual/html_node/DESTDIR.html
Cc: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
Makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 155f066a20..57b786d238 100644
--- a/Makefile
+++ b/Makefile
@@ -840,19 +840,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
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x
2019-05-21 14:53 [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x Stefan Hajnoczi
@ 2019-05-21 15:00 ` Daniel P. Berrangé
2019-06-12 12:14 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Daniel P. Berrangé @ 2019-05-21 15:00 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Peter Maydell, qemu-devel
On Tue, May 21, 2019 at 03:53:18PM +0100, Stefan Hajnoczi wrote:
> The GNU make manual[1] demonstrates $(DESTDIR)$(bindir)/foo and QEMU
> mostly follows that. There are just a few instances of
> $(DESTDIR)/$(bindir)/foo. Fix these inconsistencies.
>
> [1] https://www.gnu.org/software/make/manual/html_node/DESTDIR.html
>
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> Makefile | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 155f066a20..57b786d238 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -840,19 +840,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 :|
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x
2019-05-21 14:53 [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x Stefan Hajnoczi
2019-05-21 15:00 ` Daniel P. Berrangé
@ 2019-06-12 12:14 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2019-06-12 12:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Daniel P . Berrange
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
On Tue, May 21, 2019 at 03:53:18PM +0100, Stefan Hajnoczi wrote:
> The GNU make manual[1] demonstrates $(DESTDIR)$(bindir)/foo and QEMU
> mostly follows that. There are just a few instances of
> $(DESTDIR)/$(bindir)/foo. Fix these inconsistencies.
>
> [1] https://www.gnu.org/software/make/manual/html_node/DESTDIR.html
>
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> Makefile | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-12 12:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-21 14:53 [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x Stefan Hajnoczi
2019-05-21 15:00 ` Daniel P. Berrangé
2019-06-12 12:14 ` Stefan Hajnoczi
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).