From 94e41ec098e7389ced936ebee2c810928bb268e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 16 May 2021 16:07:19 +0200 Subject: [PATCH] meson: use jinja2 in src/udev --- src/udev/meson.build | 9 ++++++--- src/udev/udev.pc.in | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/udev/meson.build b/src/udev/meson.build index fd74e28682f..53787fa1255 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -158,11 +158,14 @@ if install_sysconfdir_samples install_dir : join_paths(sysconfdir, 'udev')) endif -configure_file( +custom_target( + 'udev.pc', input : 'udev.pc.in', output : 'udev.pc', - configuration : substs, - install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) + command : [meson_render_jinja2, config_h, '@INPUT@'], + capture : true, + install : pkgconfigdatadir != 'no', + install_dir : pkgconfigdatadir) if install_sysconfdir meson.add_install_script('sh', '-c', diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in index 05caca0ca92..cbf76939c94 100644 --- a/src/udev/udev.pc.in +++ b/src/udev/udev.pc.in @@ -9,7 +9,7 @@ Name: udev Description: udev -Version: @PROJECT_VERSION@ +Version: {{PROJECT_VERSION}} -udev_dir=@udevlibexecdir@ +udev_dir={{UDEVLIBEXECDIR}} udevdir=${udev_dir} -- 2.47.3