From f34fd2a2fe637c6b7cdb086630a1f590f461cc50 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 7 Jul 2022 16:06:56 -0400 Subject: Fix documentation build as a subproject --- doc/c/meson.build | 10 ++++------ doc/cpp/api/meson.build | 2 +- doc/cpp/meson.build | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/doc/c/meson.build b/doc/c/meson.build index f8b4626..7954776 100644 --- a/doc/c/meson.build +++ b/doc/c/meson.build @@ -30,9 +30,8 @@ subdir('xml') subdir('api') docs = custom_target( - 'singlehtml C documentation for pugl', - command: [sphinx_build, '-M', 'singlehtml', - meson.current_build_dir(), meson.current_build_dir(), + 'singlehtml', + command: [sphinx_build, '-M', 'singlehtml', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'singlehtml'], input: [c_rst_files, c_pugl_rst, c_index_xml], output: 'singlehtml', @@ -41,9 +40,8 @@ docs = custom_target( install_dir: docdir / 'pugl-0') docs = custom_target( - 'html C documentation for pugl', - command: [sphinx_build, '-M', 'html', - meson.current_build_dir(), meson.current_build_dir(), + 'html', + command: [sphinx_build, '-M', 'html', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'html'], input: [c_rst_files, c_pugl_rst, c_index_xml], output: 'html', diff --git a/doc/cpp/api/meson.build b/doc/cpp/api/meson.build index ce462ed..9c81f6f 100644 --- a/doc/cpp/api/meson.build +++ b/doc/cpp/api/meson.build @@ -3,6 +3,6 @@ cpp_pugl_rst = custom_target( 'C++ API ReST Documentation', - command: [dox_to_sphinx, '-l', 'cpp', '-f', '@INPUT@', meson.current_build_dir()], + command: [dox_to_sphinx, '-l', 'cpp', '-f', '@INPUT@', '@OUTDIR@'], input: cpp_index_xml, output: 'pugl.rst') diff --git a/doc/cpp/meson.build b/doc/cpp/meson.build index ec67d39..559362d 100644 --- a/doc/cpp/meson.build +++ b/doc/cpp/meson.build @@ -28,9 +28,8 @@ subdir('xml') subdir('api') docs = custom_target( - 'singlehtml C++ documentation for pugl', - command: [sphinx_build, '-M', 'singlehtml', - meson.current_build_dir(), meson.current_build_dir(), + 'singlehtml', + command: [sphinx_build, '-M', 'singlehtml', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'singlehtml'], input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], output: 'singlehtml', @@ -39,9 +38,8 @@ docs = custom_target( install_dir: docdir / 'puglpp-0') docs = custom_target( - 'html C++ documentation for pugl', - command: [sphinx_build, '-M', 'html', - meson.current_build_dir(), meson.current_build_dir(), + 'html', + command: [sphinx_build, '-M', 'html', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'html'], input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], output: 'html', -- cgit v1.2.1