diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-02-21 17:50:41 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2018-02-27 08:23:40 +0100 |
| commit | df246fcbaf68b5ec66306bd2b9e4299da89640bb (patch) | |
| tree | 4cc30af88e9d97c45de198a923eb390db09669d4 | |
| parent | 67f7135d2eee96a1aac6526fd6f004c19121ae2a (diff) | |
| download | eog-df246fcbaf68b5ec66306bd2b9e4299da89640bb.tar.gz | |
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
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | src/meson.build | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 19210d0e..1e6a9d54 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 5ee038a0..ef280201 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 ] ) |