[evince] meson: Use absolute paths instead of relative paths
- From: Germán Poo-Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] meson: Use absolute paths instead of relative paths
- Date: Thu, 4 Oct 2018 09:48:49 +0000 (UTC)
commit 49bd79f5dd1e199ee813accaaeef21ca12b949e4
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Wed Oct 3 22:42:59 2018 +0200
meson: Use absolute paths instead of relative paths
Many of used paths are using relative paths, which makes some
libraries/executables not to be found.
This has been changed to use absolute paths that fixes these issues.
data/meson.build | 2 +-
meson.build | 16 ++++++++--------
shell/meson.build | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 8a44e935..254884f6 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -28,7 +28,7 @@ endforeach
# DBus service file
if enable_dbus
service_conf = configuration_data()
- service_conf.set('libexecdir', join_paths(ev_prefix, ev_libexecdir))
+ service_conf.set('libexecdir', ev_libexecdir)
service_conf.set('if_systemd_service', '')
services = [[ev_namespace + '.Daemon.service', dbus_service_dir]]
diff --git a/meson.build b/meson.build
index b3e12240..332264a9 100644
--- a/meson.build
+++ b/meson.build
@@ -15,13 +15,13 @@ ev_minor_version = version_array[1].to_int()
ev_micro_version = version_array[2].to_int()
ev_prefix = get_option('prefix')
-ev_bindir = get_option('bindir')
-ev_datadir = get_option('datadir')
-ev_includedir = get_option('includedir')
-ev_libdir = get_option('libdir')
-ev_libexecdir = get_option('libexecdir')
-ev_localedir = get_option('localedir')
-ev_mandir = get_option('mandir')
+ev_bindir = join_paths(ev_prefix, get_option('bindir'))
+ev_datadir = join_paths(ev_prefix, get_option('datadir'))
+ev_includedir = join_paths(ev_prefix, get_option('includedir'))
+ev_libdir = join_paths(ev_prefix, get_option('libdir'))
+ev_libexecdir = join_paths(ev_prefix, get_option('libexecdir'))
+ev_localedir = join_paths(ev_prefix, get_option('localedir'))
+ev_mandir = join_paths(ev_prefix, get_option('mandir'))
ev_pkgdatadir = join_paths(ev_datadir, ev_name)
@@ -507,7 +507,7 @@ configure_file(
meson.add_install_script(
'meson_post_install.py',
- join_paths(ev_prefix, ev_datadir),
+ ev_datadir,
)
output = '\n' + meson.project_name() + ' configure summary\n'
diff --git a/shell/meson.build b/shell/meson.build
index d2069df5..e0cb40d1 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -74,8 +74,8 @@ deps = [
]
cflags = [
- '-DBINDIR="@0@"'.format(join_paths(ev_prefix, ev_bindir)),
- '-DGNOMEDATADIR="@0@"'.format(join_paths(ev_prefix, ev_datadir)),
+ '-DBINDIR="@0@"'.format(ev_bindir),
+ '-DGNOMEDATADIR="@0@"'.format(ev_datadir),
'-DEVINCE_COMPILATION',
'-DGDK_MULTIHEAD_SAFE',
'-DGTK_MULTIHEAD_SAFE',
@@ -160,7 +160,7 @@ if enable_dbus
]
cflags = [
- '-DBINDIR="@0@"'.format(join_paths(ev_prefix, ev_bindir)),
+ '-DBINDIR="@0@"'.format(ev_bindir),
'-DEVINCE_COMPILATION',
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]