[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] meson: install scripts/qemu-trace-stap
From: |
marcandre . lureau |
Subject: |
[PATCH 2/6] meson: install scripts/qemu-trace-stap |
Date: |
Wed, 26 Aug 2020 17:06:18 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 3 ---
meson.build | 1 +
scripts/meson.build | 3 +++
3 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 scripts/meson.build
diff --git a/Makefile b/Makefile
index 16b2ffa7fe..058cf87f54 100644
--- a/Makefile
+++ b/Makefile
@@ -244,9 +244,6 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256
512x512
# Needed by "meson install"
export DESTDIR
install: all install-datadir install-localstatedir
-ifdef CONFIG_TRACE_SYSTEMTAP
- $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
-endif
for s in $(ICON_SIZES); do \
mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
diff --git a/meson.build b/meson.build
index f0fe5f8799..6bd66243ee 100644
--- a/meson.build
+++ b/meson.build
@@ -1123,6 +1123,7 @@ if have_tools
endif
endif
+subdir('scripts')
subdir('tools')
subdir('pc-bios')
subdir('tests')
diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644
index 0000000000..e8cc63896d
--- /dev/null
+++ b/scripts/meson.build
@@ -0,0 +1,3 @@
+if 'CONFIG_TRACE_SYSTEMTAP' in config_host
+ install_data('qemu-trace-stap', install_dir: get_option('bindir'))
+endif
--
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 <=
- [PATCH 3/6] meson: install icons, marcandre . lureau, 2020/08/26
- [PATCH 4/6] meson: install desktop file, marcandre . lureau, 2020/08/26
- [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