[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] meson: install desktop file
From: |
marcandre . lureau |
Subject: |
[PATCH 4/6] meson: install desktop file |
Date: |
Wed, 26 Aug 2020 17:06:20 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 3 ---
ui/meson.build | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d1a3cd77a5..dc3c20dd5e 100644
--- a/Makefile
+++ b/Makefile
@@ -243,9 +243,6 @@ endif
# Needed by "meson install"
export DESTDIR
install: all install-datadir install-localstatedir
- mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
- $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
- "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
ifdef CONFIG_WIN32
diff --git a/ui/meson.build b/ui/meson.build
index 0b937e4455..e963c9e525 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -112,4 +112,6 @@ endif
subdir('shader')
subdir('icons')
+install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
+
modules += {'ui': ui_modules}
--
2.26.2
- [PATCH 0/6] meson: convert the remaining of install target, marcandre . lureau, 2020/08/26
- [PATCH 1/6] meson: install pc-bios blobs, marcandre . lureau, 2020/08/26
- [PATCH 2/6] meson: install scripts/qemu-trace-stap, marcandre . lureau, 2020/08/26
- [PATCH 3/6] meson: install icons, marcandre . lureau, 2020/08/26
- [PATCH 4/6] meson: install desktop file,
marcandre . lureau <=
- [PATCH 5/6] meson: install $localstatedir/run for qga, marcandre . lureau, 2020/08/26
- [PATCH 6/6] build-sys: remove install target from Makefile, marcandre . lureau, 2020/08/26