[pitivi] meson: Modernize our meson usage
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] meson: Modernize our meson usage
- Date: Tue, 13 Aug 2019 22:01:53 +0000 (UTC)
commit e5fb4bf2f51382ff7712cbab249edb28205700ce
Author: Thibault Saunier <tsaunier igalia com>
Date: Fri Aug 9 11:00:04 2019 -0400
meson: Modernize our meson usage
bin/meson.build | 4 ++--
meson.build | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/bin/meson.build b/bin/meson.build
index 48464b88..26690d6c 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -1,9 +1,9 @@
configure_file(input: 'pitivi.in',
output: 'pitivi',
- configuration: cdata)
+ configuration: cdata,
+ install_dir: get_option('bindir'))
pitivi_bin = '@0@/pitivi'.format(meson.current_build_dir())
-install_data(pitivi_bin, install_dir: get_option('bindir'))
# Create `pitivi` in the current dir at build time to be able to
# run uninstalled in the dev env.
diff --git a/meson.build b/meson.build
index c4bb1940..53634eb7 100644
--- a/meson.build
+++ b/meson.build
@@ -71,10 +71,10 @@ install_subdir('pitivi', install_dir: pitivi_install_dir)
configure_file(input: 'pitivi/configure.py.in',
output: 'configure.py',
- configuration: cdata)
+ configuration: cdata,
+ install_dir: pitivi_install_dir + 'pitivi')
configure_file = '@0@/configure.py'.format(meson.current_build_dir())
-install_data(configure_file, install_dir: pitivi_install_dir + 'pitivi')
# FIXME work around to get testsuite working
run_command('cp', configure_file, meson.current_source_dir() + '/pitivi')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]