[pitivi] build: use join_paths() in some critical places
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] build: use join_paths() in some critical places
- Date: Tue, 20 Dec 2016 16:23:33 +0000 (UTC)
commit 9a864482bc3a8b8c3bb8f05216cf69b5d9d2c764
Author: Igor Gnatenko <ignatenko src gnome org>
Date: Tue Dec 20 15:59:09 2016 +0000
build: use join_paths() in some critical places
References: https://bugzilla.redhat.com/show_bug.cgi?id=1406444
Reported-by: Han Han <hhan redhat com>
Signed-off-by: Igor Gnatenko <ignatenko src gnome org>
Reviewed-by: Thibault Saunier <tsaunier gnome org>
Differential Revision: https://phabricator.freedesktop.org/D1557
meson.build | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8e4653c..139503d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('pitivi', 'c', version: '0.98')
+project('pitivi', 'c', version : '0.98', meson_version : '>= 0.36.0')
python = find_program('python3')
intltool_merge = find_program('intltool-merge')
@@ -13,7 +13,7 @@ pycairo_dep = dependency('py3cairo')
gst_transcoder_dep = dependency('gst-transcoder-1.0', version : '>= 1.8.1',
fallback : ['gst-transcoder', 'gst_transcoder_dep'])
-pkgdatadir = get_option('datadir') + '/pitivi'
+pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
git = find_program('git', required : false)
if git.found()
@@ -35,8 +35,8 @@ cdata.set('CONFIGURED_GST_PLUGIN_PATH',
run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip())
cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH',
run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip())
-cdata.set('LIBDIR', get_option('prefix') + '/' + get_option('libdir'))
-cdata.set('DATADIR', get_option('prefix') + '/' + get_option('datadir'))
+cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))
+cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))
cdata.set('PACKAGE_NAME', 'Pitivi')
cdata.set('PACKAGE', 'pitivi')
cdata.set('GITVERSION', GITVERSION)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]