1 |
This will be called from meson.eclass and meson-multilib.eclass. |
2 |
|
3 |
Signed-off-by: Mike Gilbert <floppym@g.o> |
4 |
--- |
5 |
eclass/meson.eclass | 17 ++++++++++++----- |
6 |
1 file changed, 12 insertions(+), 5 deletions(-) |
7 |
|
8 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
9 |
index 8b22797da71..a3cf8740b26 100644 |
10 |
--- a/eclass/meson.eclass |
11 |
+++ b/eclass/meson.eclass |
12 |
@@ -404,11 +404,11 @@ meson_src_test() { |
13 |
"$@" || die "tests failed" |
14 |
} |
15 |
|
16 |
-# @FUNCTION: meson_src_install |
17 |
+# @FUNCTION: meson_install |
18 |
# @USAGE: [extra meson install arguments] |
19 |
# @DESCRIPTION: |
20 |
-# This is the meson_src_install function. |
21 |
-meson_src_install() { |
22 |
+# Calls meson install with suitable arguments |
23 |
+meson_install() { |
24 |
debug-print-function ${FUNCNAME} "$@" |
25 |
|
26 |
local mesoninstallargs=( |
27 |
@@ -420,10 +420,17 @@ meson_src_install() { |
28 |
set -- meson install "${mesoninstallargs[@]}" |
29 |
echo "$@" >&2 |
30 |
"$@" || die "install failed" |
31 |
+} |
32 |
+ |
33 |
+# @FUNCTION: meson_src_install |
34 |
+# @USAGE: [extra meson install arguments] |
35 |
+# @DESCRIPTION: |
36 |
+# This is the meson_src_install function. |
37 |
+meson_src_install() { |
38 |
+ debug-print-function ${FUNCNAME} "$@" |
39 |
|
40 |
- pushd "${S}" > /dev/null || die |
41 |
+ meson_install "$@" |
42 |
einstalldocs |
43 |
- popd > /dev/null || die |
44 |
} |
45 |
|
46 |
fi |
47 |
-- |
48 |
2.33.0 |