From f745734d9033936736c0fc7650629f7cc85634a9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Apr 2017 13:09:40 +1000 Subject: [PATCH] meson: generate the libratbag.pc file through configure_file pkgconfig.generate() does not (yet) have a parameter for setting custom variables - we need that for pkgdatadir to point to the SVG files. Swap to using configure_file with the old .pc.in file that was forgotten in the tree anyway. Signed-off-by: Peter Hutterer --- meson.build | 18 ++++++++++++------ src/libratbag.pc.in | 9 ++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 001f65b4..fc9d84a5 100644 --- a/meson.build +++ b/meson.build @@ -172,12 +172,18 @@ dep_libratbag = declare_dependency( dependencies : deps_libratbag ) -pkgconfig.generate( - filebase: 'libratbag', - name: 'Libratbag', - description: 'Mouse configuration library', - version: meson.project_version(), - libraries: lib_libratbag +pkgconfigdata = configuration_data() +pkgconfigdata.set('prefix', get_option('prefix')) +pkgconfigdata.set('libdir', get_option('libdir')) +pkgconfigdata.set('datadir', get_option('datadir')) +pkgconfigdata.set('includedir', get_option('includedir')) +pkgconfigdata.set('LIBRATBAG_VERSION', meson.project_version()) +pkgconfigfile = configure_file( + input : 'src/libratbag.pc.in', + output : 'libratbag.pc', + configuration : pkgconfigdata, + install : true, + install_dir : get_option('libdir') + '/pkgconfig' ) #### libshared.a #### diff --git a/src/libratbag.pc.in b/src/libratbag.pc.in index 2922ac9d..6269de2f 100644 --- a/src/libratbag.pc.in +++ b/src/libratbag.pc.in @@ -1,9 +1,8 @@ prefix=@prefix@ -exec_prefix=@exec_prefix@ -datarootdir=@datarootdir@ -pkgdatadir=@datadir@/@PACKAGE@ -libdir=@libdir@ -includedir=@includedir@ +datadir=${prefix}/@datadir@ +pkgdatadir=${datadir}/libratbag +libdir=${prefix}/@libdir@ +includedir=${prefix}/@includedir@ Name: Libratbag Description: Mouse configuration library