fontconfig: Branch 'main'

[GitLab Mirror <gitlab-mirror@xxxxxxxxxxxxxxxxxxxxxx>]

 src/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aec775130bf78b3851bc40b11ce4fd8bf823f245
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Wed Dec 28 21:58:09 2022 +0900

    src/meson.build: Store correct paths to fontconfig.pc.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/345

diff --git a/src/meson.build b/src/meson.build
index 9a6ba20..34ccd8c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -88,6 +88,6 @@ pkgmod.generate(libfontconfig,
   variables: [
     'sysconfdir=@0@'.format(join_paths(prefix, get_option('sysconfdir'))),
     'localstatedir=@0@'.format(join_paths(prefix, get_option('localstatedir'))),
-    'confdir=${sysconfdir}/fonts',
-    'cachedir=${localstatedir}/cache/fontconfig',
+    'confdir=@0@'.format(fc_baseconfigdir),
+    'cachedir=@0@'.format(fc_cachedir),
   ])