qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 120/132] meson: install some scripts


From: Paolo Bonzini
Subject: [PATCH 120/132] meson: install some scripts
Date: Thu, 19 Dec 2019 13:23:40 +0100

From: Marc-André Lureau <address@hidden>

Signed-off-by: Marc-André Lureau <address@hidden>
---
 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 710659b..d64e481 100644
--- a/Makefile
+++ b/Makefile
@@ -275,9 +275,6 @@ ifneq ($(vhost-user-json-y),)
                $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \
        done
 endif
-ifdef CONFIG_TRACE_SYSTEMTAP
-       $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
-endif
 ifneq ($(BLOBS),)
        set -e; for x in $(BLOBS); do \
                $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(qemu_datadir)"; \
diff --git a/meson.build b/meson.build
index ce67e4c..32b9430 100644
--- a/meson.build
+++ b/meson.build
@@ -943,6 +943,7 @@ if have_tools
   endif
 endif
 
+subdir('scripts')
 subdir('pc-bios')
 subdir('docs')
 
diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644
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
-- 
1.8.3.1





reply via email to

[Prev in Thread] Current Thread [Next in Thread]