From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 18 Jun 2020 00:27:48 +0000 (+0200)
Subject: meson: docs/fonts: install font files
X-Git-Tag: v6.7.0-rc1~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=033e01684304009cc6fd161b2317c777df4c0e46;p=thirdparty%2Flibvirt.git

meson: docs/fonts: install font files

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index ae504358d2..7398628b6c 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 0000000000..8c0a2f1554
--- /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 09bf436a46..7c741041c8 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -288,6 +288,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