[eog] build: Fix exec_prefix variable
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] build: Fix exec_prefix variable
- Date: Tue, 27 Feb 2018 07:31:09 +0000 (UTC)
commit df246fcbaf68b5ec66306bd2b9e4299da89640bb
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Wed Feb 21 17:50:41 2018 +0100
build: Fix exec_prefix variable
The `exec_prefix` variable inside the pkg-config file is pointing to
`libexecdir` but it should be pointing to prefix instead.
This has been changed so `exec_prefix` points to the proper path.
The `libexecdir` meson variable has also been removed because the
only the `pkglibexecdir` variable is used.
https://bugzilla.gnome.org/show_bug.cgi?id=793719
meson.build | 3 +--
src/meson.build | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 19210d0..1e6a9d5 100644
--- a/meson.build
+++ b/meson.build
@@ -22,12 +22,11 @@ eog_prefix = get_option('prefix')
eog_datadir = join_paths(eog_prefix, get_option('datadir'))
eog_includedir = join_paths(eog_prefix, get_option('includedir'))
eog_libdir = join_paths(eog_prefix, get_option('libdir'))
-eog_libexecdir = join_paths(eog_prefix, get_option('libexecdir'))
eog_localedir = join_paths(eog_prefix, get_option('localedir'))
eog_pkgdatadir = join_paths(eog_datadir, meson.project_name())
eog_pkglibdir = join_paths(eog_libdir, meson.project_name())
-eog_pkglibexecdir = join_paths(eog_libexecdir, meson.project_name())
+eog_pkglibexecdir = join_paths(eog_prefix, get_option('libexecdir'), meson.project_name())
eog_pluginsdir = join_paths(eog_pkglibdir, 'plugins')
eog_schemadir = join_paths(eog_datadir, 'glib-2.0', 'schemas')
diff --git a/src/meson.build b/src/meson.build
index 5ee038a..ef28020 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -172,7 +172,7 @@ pkg.generate(
subdirs: eog_api_name,
requires: 'gtk+-3.0',
variables: [
- 'exec_prefix=' + eog_libexecdir,
+ 'exec_prefix=' + eog_prefix,
'pluginsdir=' + eog_pluginsdir
]
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]