[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 127/142] meson: install some scripts
From: |
Paolo Bonzini |
Subject: |
[PATCH 127/142] meson: install some scripts |
Date: |
Tue, 28 Jan 2020 18:53:27 +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 7c1e6d9e9c..98582518a8 100644
--- a/Makefile
+++ b/Makefile
@@ -265,9 +265,6 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256
512x512
install: all install-datadir install-localstatedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed))
-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 6d1fc2fb19..cd6e41b6d0 100644
--- a/meson.build
+++ b/meson.build
@@ -968,6 +968,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 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.21.0
- [PATCH 117/142] meson: softmmu, (continued)
- [PATCH 117/142] meson: softmmu, Paolo Bonzini, 2020/01/28
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28
- [PATCH 120/142] meson: generate systemtap tapset files, Paolo Bonzini, 2020/01/28
- [PATCH 121/142] build-sys/rules.mak: remove version.o, Paolo Bonzini, 2020/01/28
- [PATCH 119/142] Aaaaallelujah!, Paolo Bonzini, 2020/01/28
- [PATCH 122/142] remove Makefile.target, Paolo Bonzini, 2020/01/28
- [PATCH 123/142] meson: sphinx-build, Paolo Bonzini, 2020/01/28
- [PATCH 124/142] meson: generate version.texi, Paolo Bonzini, 2020/01/28
- [PATCH 126/142] meson: add NSIS building, Paolo Bonzini, 2020/01/28
- [PATCH 125/142] meson: build texi doc, Paolo Bonzini, 2020/01/28
- [PATCH 127/142] meson: install some scripts,
Paolo Bonzini <=
- [PATCH 128/142] meson: install edk2, Paolo Bonzini, 2020/01/28
- [PATCH 130/142] meson: install edk2 json descriptors, Paolo Bonzini, 2020/01/28
- [PATCH 129/142] meson: install blobs, Paolo Bonzini, 2020/01/28
- [PATCH 132/142] meson: install desktop file, Paolo Bonzini, 2020/01/28
- [PATCH 131/142] meson: install icons, Paolo Bonzini, 2020/01/28
- [PATCH 133/142] meson: convert pc-bios/keymaps/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 134/142] meson: convert po/, Paolo Bonzini, 2020/01/28
- [PATCH 137/142] meson: convert pc-bios/optionrom, Paolo Bonzini, 2020/01/28
- [PATCH 136/142] meson: convert pc-bios/s390-ccw, Paolo Bonzini, 2020/01/28
- [PATCH 135/142] meson: replace mostly useless pc-bios/Makefile, Paolo Bonzini, 2020/01/28