[meld] Update meson build to strip env from shebang line (#692)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update meson build to strip env from shebang line (#692)
- Date: Thu, 11 Aug 2022 07:06:26 +0000 (UTC)
commit 4846b2c8e6a2602301ebd79e511f71e06d233fc5
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Aug 11 17:03:00 2022 +1000
Update meson build to strip env from shebang line (#692)
This was previously done by distutils, but since the swap to Meson it
hasn't been a thing. On most distros the env is removed/normalised by
packaging scripts, etc. but this isn't the case for all distros.
bin/meson.build | 7 +++++++
meson.build | 3 +--
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/bin/meson.build b/bin/meson.build
new file mode 100644
index 00000000..9a743eb8
--- /dev/null
+++ b/bin/meson.build
@@ -0,0 +1,7 @@
+
+configure_file(
+ input: 'meld',
+ output: 'meld',
+ command: ['../meson_shebang_normalisation.py', '@INPUT@', '@OUTPUT@'],
+ install_dir: bindir,
+)
diff --git a/meson.build b/meson.build
index 494fd9d1..eb414ad6 100644
--- a/meson.build
+++ b/meson.build
@@ -48,11 +48,10 @@ gio_schemasdir = dependency('gio-2.0').get_pkgconfig_variable(
default: datadir / 'glib-2.0/schemas',
)
+subdir('bin')
subdir('meld')
subdir('data')
subdir('help')
subdir('po')
-install_data('bin/meld', install_dir: bindir)
-
meson.add_install_script('meson_post_install.py', get_option('byte-compile') ? python3.get_install_dir() :
'')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]