Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
docs/Makefile.am | 32 --------------------------------
docs/logos/meson.build | 29 +++++++++++++++++++++++++++++
docs/meson.build | 1 +
3 files changed, 30 insertions(+), 32 deletions(-)
create mode 100644 docs/logos/meson.build
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a25fe49b6b7..d17455f135e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,38 +16,6 @@
## License along with this library. If not, see
## <
http://www.gnu.org/licenses/>.
-all: vpathhack
-
-# This hack enables us to view the web pages
-# from within the uninstalled build tree
-vpathhack:
- @for dir in logos; \
- do \
- test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \
- done
-
-logofiles = \
- logos/logo-base.svg \
- logos/logo-square.svg \
- logos/logo-square-powered.svg \
- logos/logo-banner-dark.svg \
- logos/logo-banner-light.svg \
- logos/logo-square-96.png \
- logos/logo-square-128.png \
- logos/logo-square-192.png \
- logos/logo-square-256.png \
- logos/logo-square-powered-96.png \
- logos/logo-square-powered-128.png \
- logos/logo-square-powered-192.png \
- logos/logo-square-powered-256.png \
- logos/logo-banner-dark-256.png \
- logos/logo-banner-dark-800.png \
- logos/logo-banner-light-256.png \
- logos/logo-banner-light-800.png
-
-logofilesdir = $(HTML_DIR)/logos
-logofiles_DATA = $(logofiles)
-
# Sync with src/util/
KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 qnum
KEYNAMES = linux osx win32
diff --git a/docs/logos/meson.build b/docs/logos/meson.build
new file mode 100644
index 00000000000..da92c397cde
--- /dev/null
+++ b/docs/logos/meson.build
@@ -0,0 +1,29 @@
+docs_logo_files = [
+ 'logo-banner-dark-256.png',
+ 'logo-banner-dark-800.png',
+ 'logo-banner-dark.svg',
+ 'logo-banner-light-256.png',
+ 'logo-banner-light-800.png',
+ 'logo-banner-light.svg',
+ 'logo-base.svg',
+ 'logo-square-128.png',
+ 'logo-square-192.png',
+ 'logo-square-256.png',
+ 'logo-square-96.png',
+ 'logo-square-powered-128.png',
+ 'logo-square-powered-192.png',
+ 'logo-square-powered-256.png',
+ 'logo-square-powered-96.png',
+ 'logo-square-powered.svg',
+ 'logo-square.svg',
+ 'logo-sticker-hexagon.svg',
+ 'logo-sticker-square.svg',
+]
+
+install_data(docs_logo_files, install_dir: docs_html_dir / 'logos')
+
+# This hack enables us to view the web pages
+# from within the uninstalled build tree
+foreach file : docs_logo_files
+ configure_file(input: file, output: file, copy: true)
+endforeach
diff --git a/docs/meson.build b/docs/meson.build
index 069778ce890..17c8f956870 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -289,6 +289,7 @@ subdir('html')
subdir('internals')
subdir('js')
subdir('kbase')
+subdir('logos')
# This hack enables us to view the web pages
--
2.26.2