Commit 6c11dda9 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

build: use $(DESTDIR)x instead of $(DESTDIR)/x 

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-id: 20190521145318.12787-1-stefanha@redhat.com
Message-Id: <20190521145318.12787-1-stefanha@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 474f3938

Makefile

+8 −8
Original line number Diff line number Diff line
@@ -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