diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-13 21:50:46 +0200 |
|---|---|---|
| committer | Marco Trevisan <mail@3v1n0.net> | 2019-09-10 15:20:15 +0000 |
| commit | de5d65b1ea2fbd46185cefd635eab61f08c012c1 (patch) | |
| tree | d0e08387d06f7f9228acbea6b4f6bd57e865e9da | |
| parent | 5e1389f114e0a2e7835abbf4764b98678c1dc482 (diff) | |
| download | libwnck-de5d65b1ea2fbd46185cefd635eab61f08c012c1.tar.gz | |
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.
| -rw-r--r-- | meson.build | 4 |
1 files 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) |