[Fontconfig] fontconfig: Branch 'main'

[GitLab Mirror]

 conf.d/meson.build |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

    meson: Use fc_templatedir and fc_baseconfigdir are used when installing configs
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/conf.d/meson.build b/conf.d/meson.build
index db99b37..3eddfb3 100644
--- a/conf.d/meson.build
+++ b/conf.d/meson.build
@@ -62,11 +62,10 @@ conf_links = [
   '90-synthetic.conf',
 ]
 
-install_data(conf_files, install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'))
+install_data(conf_files, install_dir: fc_templatedir)
 
-meson.add_install_script('link_confs.py',
-  join_paths(get_option('prefix'), get_option('datadir'), 'fontconfig/conf.avail'),
-  join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
+meson.add_install_script('link_confs.py', fc_templatedir,
+  join_paths(fc_baseconfigdir, 'conf.d'),
   conf_links,
 )
 
@@ -82,7 +81,7 @@ endforeach
 custom_target('35-lang-normalize.conf',
   output: '35-lang-normalize.conf',
   command: [find_program('write-35-lang-normalize-conf.py'), ','.join(orths), '@OUTPUT@'],
-  install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'),
+  install_dir: fc_templatedir,
   install: true)
 
 # README
@@ -91,5 +90,5 @@ readme_cdata.set('TEMPLATEDIR', fc_templatedir)
 configure_file(output: 'README',
   input: 'README.in',
   configuration: readme_cdata,
-  install_dir: join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
+  install_dir: join_paths(fc_baseconfigdir, 'conf.d'),
   install: true)