[Fontconfig] fontconfig: Branch 'main'

[GitLab Mirror]

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

New commits:
commit fd0753af88f746fd3d729bf6e1df08eefeeaa3ac
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Jun 20 14:53:51 2022 -0700

    meson: Use fc_configdir where appropriate during build
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/conf.d/meson.build b/conf.d/meson.build
index 3eddfb3..dbb1606 100644
--- a/conf.d/meson.build
+++ b/conf.d/meson.build
@@ -65,7 +65,7 @@ conf_links = [
 install_data(conf_files, install_dir: fc_templatedir)
 
 meson.add_install_script('link_confs.py', fc_templatedir,
-  join_paths(fc_baseconfigdir, 'conf.d'),
+  fc_configdir,
   conf_links,
 )
 
@@ -90,5 +90,5 @@ readme_cdata.set('TEMPLATEDIR', fc_templatedir)
 configure_file(output: 'README',
   input: 'README.in',
   configuration: readme_cdata,
-  install_dir: join_paths(fc_baseconfigdir, 'conf.d'),
+  install_dir: fc_configdir,
   install: true)