meson: Use fc_templatedir and fc_baseconfigdir are used when installing configs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
parent
1bc38359d1
commit
db55c4b15e
|
@ -62,11 +62,10 @@ conf_links = [
|
||||||
'90-synthetic.conf',
|
'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',
|
meson.add_install_script('link_confs.py', fc_templatedir,
|
||||||
join_paths(get_option('prefix'), get_option('datadir'), 'fontconfig/conf.avail'),
|
join_paths(fc_baseconfigdir, 'conf.d'),
|
||||||
join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
|
|
||||||
conf_links,
|
conf_links,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -82,7 +81,7 @@ endforeach
|
||||||
custom_target('35-lang-normalize.conf',
|
custom_target('35-lang-normalize.conf',
|
||||||
output: '35-lang-normalize.conf',
|
output: '35-lang-normalize.conf',
|
||||||
command: [find_program('write-35-lang-normalize-conf.py'), ','.join(orths), '@OUTPUT@'],
|
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)
|
install: true)
|
||||||
|
|
||||||
# README
|
# README
|
||||||
|
@ -91,5 +90,5 @@ readme_cdata.set('TEMPLATEDIR', fc_templatedir)
|
||||||
configure_file(output: 'README',
|
configure_file(output: 'README',
|
||||||
input: 'README.in',
|
input: 'README.in',
|
||||||
configuration: readme_cdata,
|
configuration: readme_cdata,
|
||||||
install_dir: join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
|
install_dir: join_paths(fc_baseconfigdir, 'conf.d'),
|
||||||
install: true)
|
install: true)
|
||||||
|
|
Loading…
Reference in New Issue