[gnome-video-effects/wip/jtojnar/meson-fixes: 4/4] build: Fix effectsdir in .pc file
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-video-effects/wip/jtojnar/meson-fixes: 4/4] build: Fix effectsdir in .pc file
- Date: Mon, 19 Aug 2019 17:28:22 +0000 (UTC)
commit 955404195ada606819974dd63c48956f25611e14
Author: Jan Tojnar <jtojnar gmail com>
Date: Mon Aug 19 19:23:46 2019 +0200
build: Fix effectsdir in .pc file
The meson port changed the effectsdir in the .pc file to
$(pkgdatadir)/gnome-video-effects, resulting in paths like
…/share/gnome-video-effects/gnome-video-effects.
Here we fix the regression such that the path matches to
the actual path where the files are installed.
Also we use ${prefix} pkg-config variable in the path
so that it can be easily overridden.
meson.build | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index e2aa69a..f3d5b65 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,8 @@ gnome = import('gnome')
i18n = import('i18n')
prefix = get_option('prefix')
-datadir = prefix / get_option('datadir')
+datadir_relative = get_option('datadir')
+datadir = prefix / datadir_relative
pkgdatadir = datadir / meson.project_name()
pkgconfigdir = datadir / 'pkgconfig'
@@ -17,7 +18,7 @@ subdir('po')
# Can't use pkgconfig helper https://github.com/mesonbuild/meson/issues/2253
conf = configuration_data()
conf.set('prefix', prefix)
-conf.set('datarootdir', pkgdatadir)
+conf.set('datarootdir', '${prefix}' / datadir_relative)
conf.set('VERSION', meson.project_version())
pkg = configure_file(configuration: conf,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]