Re: [Qemu-devel] [PATCH] build: use $(DESTDIR)x instead of $(DESTDIR)/x

[Daniel P . Berrangé]

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 <address@hidden>
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
>  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é <address@hidden>


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 :|