Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- docs/Makefile.am | 9 +-------- docs/js/meson.build | 11 +++++++++++ docs/meson.build | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 docs/js/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 0e59b00961c..6b2ee2747e2 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 00000000000..da90cbf96e1 --- /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 b211a377f59..bbd6faaa786 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -287,6 +287,7 @@ endforeach subdir('fonts') subdir('html') subdir('internals') +subdir('js') # This hack enables us to view the web pages -- 2.26.2