summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2021-09-10 10:15:25 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-09-13 15:27:24 +0200
commit1381a993ece326068685e48253e5e803fe01fb75 (patch)
tree958c72252d7f679d7561ebc30e569bdb36bb914b
parent6e7b0d8f8f22f1d69c06a66316164f67bb908f18 (diff)
downloadlibqmi-1381a993ece326068685e48253e5e803fe01fb75.tar.gz
build: Use the install_mode option
Since meson 0.47, `install_mode` option can be used to set a given set of rights to any target. This feature has been used to set `qmi-network` rights instead of using a post install script. [0] https://mesonbuild.com/Release-notes-for-0-47-0.html#install_mode-keyword-argument-extended-to-all-installable-targets (cherry picked from commit 79f01fdd90c68bdfe248cc3763ee50cf15c49e4e)
-rwxr-xr-xmeson_post_install.py3
-rw-r--r--utils/meson.build1
2 files changed, 1 insertions, 3 deletions
diff --git a/meson_post_install.py b/meson_post_install.py
index 245fb6a3..76337d5d 100755
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -9,9 +9,6 @@ import sys
prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX']
-bindir = os.path.join(prefix, sys.argv[1])
-subprocess.check_call(['chmod', '755', os.path.join(bindir, 'qmi-network')])
-
bash_completion_completionsdir = sys.argv[2]
if bash_completion_completionsdir:
if not os.path.isabs(bash_completion_completionsdir):
diff --git a/utils/meson.build b/utils/meson.build
index 3fb6e4ab..727aa68e 100644
--- a/utils/meson.build
+++ b/utils/meson.build
@@ -18,4 +18,5 @@ qmi_network = configure_file(
output: '@BASENAME@',
configuration: version_conf,
install_dir: qmi_bindir,
+ install_mode: 'rwxr-xr-x',
)