diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-02-22 13:22:56 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2018-02-27 08:37:02 +0100 |
| commit | 96eec4ac537d89ebc8aac8ae4aa7cd94f5d75dde (patch) | |
| tree | 07e6e793686672b92ca9b68db7834c760a3bed34 | |
| parent | 5b34ab7a52d998c95a37021e71a4a4d51df1b674 (diff) | |
| download | eog-96eec4ac537d89ebc8aac8ae4aa7cd94f5d75dde.tar.gz | |
build: Reuse pkglibdir meson variable
The installation directory used on the build of the shared library
was used in the pkg-config file generation. Due to this behaviour
when using the full path as shared library generation caused the
libdir path to be wrong.
However, this has been fixed in meson's 0.44 version so the
pkglibdir directory is reused for this.
The required meson version has also been updated accordingly.
https://bugzilla.gnome.org/show_bug.cgi?id=793719
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 1b8b6891..03febd18 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( version: '3.27.91', license: 'GPL2+', default_options: 'buildtype=debugoptimized', - meson_version: '>= 0.43.0' + meson_version: '>= 0.44.0' ) eog_version = meson.project_version() diff --git a/src/meson.build b/src/meson.build index f24bc4af..c61d623d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -158,7 +158,7 @@ libeog = shared_library( link_args: ldflags, link_depends: symbol_map, install: true, - install_dir: join_paths(get_option('libdir'), meson.project_name()) + install_dir: eog_pkglibdir ) libeog_dep = declare_dependency( |