[pacman-dev] [PATCH v2 1/2] meson: fix website target

Eli Schwartz eschwartz at archlinux.org
Mon Jan 14 03:55:00 UTC 2019


A number of pages don't actually exist as html inside the source tree,
and need to be generated even though they are manpages.

This caused the website.tar.gz target to only work inside a dirty tree
initially created by autotools.

Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
---

v2: remove redundant whitespace, simplify HACKING.html source since it
is a file target anyway.

 doc/meson.build | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/meson.build b/doc/meson.build
index 7c9631cb..b7514ef7 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -14,6 +14,13 @@ manpages = [
   { 'name': 'BUILDINFO.5' },
 ]

+sitepages = [
+  { 'name': 'submitting-patches' },
+  { 'name': 'translation-help' },
+  { 'name': 'HACKING', 'source': '../HACKING' },
+  { 'name': 'index' },
+]
+
 asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf')

 asciidoc_opts = [
@@ -58,6 +65,12 @@ foreach page : manpages
     install : true,
     install_dir : mandirn,
   )
+endforeach
+
+foreach page: manpages + sitepages
+  manpage = page['name']
+  htmlpage = '@0 at .html'.format(manpage)
+  input = page.get('source', '@0 at .asciidoc'.format(manpage))

   html = custom_target(
     htmlpage,
@@ -96,10 +109,6 @@ custom_target(
     '-C', meson.current_build_dir(),
   ] + html_files + [
     '-C', meson.current_source_dir(),
-    'submitting-patches.html',
-    'translation-help.html',
-    'HACKING.html',
-    'index.html',
     'asciidoc-override.css',
     '-C', '/etc/asciidoc/stylesheets/',
     'asciidoc.css',
--
2.20.1


More information about the pacman-dev mailing list