Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- docs/Makefile.am | 19 +------------------ docs/fonts/meson.build | 22 ++++++++++++++++++++++ docs/meson.build | 2 ++ 3 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 docs/fonts/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index ae504358d26..7398628b6c0 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -42,7 +42,7 @@ all: vpathhack # This hack enables us to view the web pages # from within the uninstalled build tree vpathhack: - @for dir in fonts js logos; \ + @for dir in js logos; \ do \ test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done @@ -95,23 +95,6 @@ javascript = \ javascriptdir = $(HTML_DIR)/js javascript_DATA = $(javascript) -fonts = \ - fonts/LICENSE.rst \ - fonts/stylesheet.css \ - fonts/overpass-bold-italic.woff \ - fonts/overpass-bold.woff \ - fonts/overpass-italic.woff \ - fonts/overpass-light-italic.woff \ - fonts/overpass-light.woff \ - fonts/overpass-mono-bold.woff \ - fonts/overpass-mono-light.woff \ - fonts/overpass-mono-regular.woff \ - fonts/overpass-mono-semibold.woff \ - fonts/overpass-regular.woff - -fontsdir = $(HTML_DIR)/fonts -fonts_DATA = $(fonts) - logofiles = \ logos/logo-base.svg \ logos/logo-square.svg \ diff --git a/docs/fonts/meson.build b/docs/fonts/meson.build new file mode 100644 index 00000000000..8c0a2f1554d --- /dev/null +++ b/docs/fonts/meson.build @@ -0,0 +1,22 @@ +fonts = [ + 'LICENSE.rst', + 'stylesheet.css', + 'overpass-bold-italic.woff', + 'overpass-bold.woff', + 'overpass-italic.woff', + 'overpass-light-italic.woff', + 'overpass-light.woff', + 'overpass-mono-bold.woff', + 'overpass-mono-light.woff', + 'overpass-mono-regular.woff', + 'overpass-mono-semibold.woff', + 'overpass-regular.woff', +] + +install_data(fonts, install_dir: docs_html_dir / 'fonts') + +# This hack enables us to view the web pages +# from within the uninstalled build tree +foreach file : fonts + configure_file(input: file, output: file, copy: true) +endforeach diff --git a/docs/meson.build b/docs/meson.build index bc9524eb69e..7dc2bbdc42a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -281,6 +281,8 @@ foreach data : docs_html_in_gen ) endforeach +subdir('fonts') + # This hack enables us to view the web pages # from within the uninstalled build tree -- 2.26.2