From 1485cfb36cbdc2a079f73be16670cb3e64567852 Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Tue, 16 Jul 2024 21:23:28 +1000 Subject: Generate pkg-config files directly - Remove 'pkgconfig' subdir - use meson 'pkgconfig' module to generate and install appropriate .pc files when required. - add `rc_path` variable to installed pkgconfig files Signed-off-by: Matt Jolly --- pkgconfig/einfo.pc.in | 9 --------- pkgconfig/meson.build | 24 ------------------------ pkgconfig/openrc.pc.in | 10 ---------- 3 files changed, 43 deletions(-) delete mode 100644 pkgconfig/einfo.pc.in delete mode 100644 pkgconfig/meson.build delete mode 100644 pkgconfig/openrc.pc.in (limited to 'pkgconfig') diff --git a/pkgconfig/einfo.pc.in b/pkgconfig/einfo.pc.in deleted file mode 100644 index b5242a66..00000000 --- a/pkgconfig/einfo.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@PREFIX@ -exec_prefix=${prefix} -libdir=${prefix}/@LIB@ -includedir=/usr/include - -Name: einfo -Description: Pretty console informational display -Version: @VERSION@ -Libs: -L${libdir} -leinfo diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build deleted file mode 100644 index 424b6ee0..00000000 --- a/pkgconfig/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -if get_option('pkgconfig') -pkgconfig_dir = get_option('libdir') / 'pkgconfig' - -pkgconfig_conf_data = configuration_data() -if rootprefix != '/' - pkgconfig_conf_data.set('PREFIX', rootprefix) -else - pkgconfig_conf_data.set('PREFIX', '') -endif -pkgconfig_conf_data.set('LIB', get_option('libdir')) -pkgconfig_conf_data.set('VERSION', meson.project_version()) - -pkgconfig_files = [ - 'einfo.pc.in', - 'openrc.pc.in', - ] - -foreach file : pkgconfig_files - configure_file(input : file, - output : '@BASENAME@', - configuration : pkgconfig_conf_data, - install_dir : pkgconfig_dir) -endforeach -endif diff --git a/pkgconfig/openrc.pc.in b/pkgconfig/openrc.pc.in deleted file mode 100644 index 9a8a9165..00000000 --- a/pkgconfig/openrc.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@PREFIX@ -exec_prefix=${prefix} -libdir=${prefix}/@LIB@ -includedir=/usr/include - -Name: OpenRC -Description: Universal init system -Version: @VERSION@ -Cflags: -I${includedir} -Libs: -L${libdir} -lrc -- cgit v1.2.3