ref: 47b1a541cb1943d85da3976b93f9a5ed490288e2
parent: d2367abac0859b09d8defe034dd6ebbc0391a51a
author: Heiko Becker <[email protected]>
date: Tue Jul 27 19:30:16 EDT 2021
* meson.build: Honor `--includedir` instead of hard-coding 'include'. Signed-off-by: Heiko Becker <[email protected]>
--- a/meson.build
+++ b/meson.build
@@ -49,6 +49,7 @@
ft2_includes = include_directories('include')+freetype_includedir = join_paths(get_option('includedir'), 'freetype2')# Generate a custom `ftmodule.h` version based on the content of
# `modules.cfg`.
@@ -59,7 +60,7 @@
command: [python_exe, files('builds/meson/parse_modules_cfg.py'),'--format=ftmodule.h', '@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: 'include/freetype2/freetype/config',
+ install_dir: join_paths(freetype_includedir, 'freetype/config'),
)
ft2_sources = [ftmodule_h]
@@ -303,7 +304,7 @@
output: 'ftoption.h',
command: ftoption_command,
install: true,
- install_dir: 'include/freetype2/freetype/config',
+ install_dir: join_paths(freetype_includedir, 'freetype/config'),
)
ft2_sources += ftoption_h
ft2_defines += ['-DFT_CONFIG_OPTIONS_H=<ftoption.h>']
@@ -330,7 +331,7 @@
output: 'ftconfig.h',
command: ftconfig_command,
install: true,
- install_dir: 'include/freetype2/freetype/config',
+ install_dir: join_paths(freetype_includedir, 'freetype/config'),
)
ft2_sources += ftconfig_h
ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
@@ -361,11 +362,11 @@
# i.e., the subdir value seems to be ignored, contrary to examples in the
# Meson documentation.
install_headers('include/ft2build.h',- install_dir: 'include/freetype2')
+ install_dir: freetype_includedir)
install_headers(ft2_public_headers,
- install_dir: 'include/freetype2/freetype')
+ install_dir: join_paths(freetype_includedir, 'freetype'))
install_headers(ft2_config_headers,
- install_dir: 'include/freetype2/freetype/config')
+ install_dir: join_paths(freetype_includedir, 'freetype/config'))
pkgconfig = import('pkgconfig')