build: fix overriding libdir & includedir

Previously, pkgconfig files hard-coded the include and lib directory names,
breaking the configuration when they were overridden.
This commit is contained in:
Jan Tojnar
2018-05-31 01:13:49 +02:00
parent b3bf7968ad
commit d19a496bb5
4 changed files with 8 additions and 6 deletions

View File

@ -31,6 +31,8 @@ pkgconf = configuration_data()
pkgconf.set('VERSION', meson.project_version())
pkgconf.set('API_VERSION', libsysprof_api_version)
pkgconf.set('prefix', get_option('prefix'))
pkgconf.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))
pkgconf.set('includedir', join_paths('${prefix}', get_option('includedir')))
pkgconfigdir = join_paths(get_option('libdir'), 'pkgconfig')
configure_file(

View File

@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include
libdir=@libdir@
includedir=@includedir@
Name: libsysprof-capture-@API_VERSION@
Description: The sysprof profiler library for reading and writing capture files

View File

@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include
libdir=@libdir@
includedir=@includedir@
Name: libsysprof-ui-@API_VERSION@
Description: The sysprof library containing reusable GTK widgets

View File

@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include
libdir=@libdir@
includedir=@includedir@
Name: libsysprof-@API_VERSION@
Description: The sysprof profiler library