[libwnck/wip/jtojnar/meson-fixes: 1/2] build: Fix paths in pc files
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libwnck/wip/jtojnar/meson-fixes: 1/2] build: Fix paths in pc files
- Date: Tue, 13 Aug 2019 20:04:05 +0000 (UTC)
commit 79f110eb654be557354fa04c9019fb754e7a216e
Author: Jan Tojnar <jtojnar gmail com>
Date: Tue Aug 13 21:50:46 2019 +0200
build: Fix paths in pc files
With absolute includedir (for example on NixOS), the pkg-config
file will contain an incorrect includedir. This patch fixes that
without affecting more standard environments.
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 28799d8..632ed64 100644
--- a/meson.build
+++ b/meson.build
@@ -72,8 +72,8 @@ configure_file(input: 'config.h.meson',
pc_conf = configuration_data()
pc_conf.set('prefix', get_option('prefix'))
pc_conf.set('exec_prefix', '${prefix}')
-pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir'))
-pc_conf.set('includedir', '${prefix}/' + get_option('includedir'))
+pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir'))
+pc_conf.set('includedir', '${prefix}' / get_option('includedir'))
pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE)
pc_conf.set('X11_PACKAGE', X11_PACKAGE)
pc_conf.set('XRES_PACKAGE', XRES_PACKAGE)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]