On Sat, Jan 12, 2019 at 09:15:00PM -0500, Eli Schwartz wrote:
> 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 <eschwa...@archlinux.org>
> ---
> doc/meson.build | 19 +++++++++++++++----
> 1 file changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/doc/meson.build b/doc/meson.build
> index 7c9631cb..4d796492 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': join_paths(meson.current_source_dir(),
> '../HACKING') },
This would be nicer as join_paths(meson.source_root(), '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@.html'.format(manpage)
> + input = page.get('source', '@0@.asciidoc'.format(manpage))
>
> html = custom_target(
> htmlpage,
> @@ -85,6 +98,8 @@ foreach page : manpages
> html_files += [htmlpage]
> endforeach
>
> +
> +
One too many newlines?
> run_target('html',
> command : ['/bin/true'],
> depends : html_targets)
> @@ -96,10 +111,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
