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

meson: docs/js: install javascript 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 0e59b00961..6b2ee2747e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -21,18 +21,11 @@ all: vpathhack
 # This hack enables us to view the web pages
 # from within the uninstalled build tree
 vpathhack:
-	@for dir in js logos; \
+	@for dir in logos; \
 	do \
 	  test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \
 	done
 
-javascript = \
-  js/main.js \
-  $(NULL)
-
-javascriptdir = $(HTML_DIR)/js
-javascript_DATA = $(javascript)
-
 logofiles = \
   logos/logo-base.svg \
   logos/logo-square.svg \
diff --git a/docs/js/meson.build b/docs/js/meson.build
new file mode 100644
index 0000000000..da90cbf96e
--- /dev/null
+++ b/docs/js/meson.build
@@ -0,0 +1,11 @@
+docs_js_files = [
+  'main.js',
+]
+
+install_data(docs_js_files, install_dir: docs_html_dir / 'js')
+
+# This hack enables us to view the web pages
+# from within the uninstalled build tree
+foreach file : docs_js_files
+  configure_file(input: file, output: file, copy: true)
+endforeach
diff --git a/docs/meson.build b/docs/meson.build
index 17f491a5b7..39d12b5dfd 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -294,6 +294,7 @@ endforeach
 subdir('fonts')
 subdir('html')
 subdir('internals')
+subdir('js')
 
 
 # This hack enables us to view the web pages