varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix overriding libdir & includedir

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
data/meson.build
View File

@ -31,6 +31,8 @@ pkgconf = configuration_data()
pkgconf.set('VERSION', meson.project_version()) pkgconf.set('VERSION', meson.project_version())
pkgconf.set('API_VERSION', libsysprof_api_version) pkgconf.set('API_VERSION', libsysprof_api_version)
pkgconf.set('prefix', get_option('prefix')) 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') pkgconfigdir = join_paths(get_option('libdir'), 'pkgconfig')
configure_file( configure_file(

4
data/sysprof-capture.pc.in
View File

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

4
data/sysprof-ui.pc.in
View File

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

4
data/sysprof.pc.in
View File

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