meson: install scripts/qemu-trace-stap

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-3-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/Makefile b/Makefile
index 16b2ffa..058cf87 100644 (file)
--- 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 3c919e3..6b2fc76 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1138,6 +1138,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 (file)
index 0000000..e8cc638
--- /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