diff mbox series

doc: install guides and api docs to different directories

Message ID 20241223153846.230648-1-luca.boccassi@gmail.com (mailing list archive)
State New
Delegated to: Thomas Monjalon
Headers
Series doc: install guides and api docs to different directories |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/intel-Functional success Functional PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-sample-apps-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-marvell-Functional success Functional Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-compile-amd64-testing success Testing PASS

Commit Message

Luca Boccassi Dec. 23, 2024, 3:38 p.m. UTC 
From: Luca Boccassi <bluca@debian.org>

Otherwise they both get installed to /usr/share/doc/dpdk/html/ and overwrite
each other's files

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 doc/api/meson.build    | 2 +-
 doc/guides/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Bruce Richardson Jan. 6, 2025, 10:30 a.m. UTC | #1 
On Mon, Dec 23, 2024 at 03:38:40PM +0000, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
> 
> Otherwise they both get installed to /usr/share/doc/dpdk/html/ and overwrite
> each other's files
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
>  doc/api/meson.build    | 2 +-
>  doc/guides/meson.build | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
diff mbox series

Patch

diff --git a/doc/api/meson.build b/doc/api/meson.build
index 9b66dce4f3..23ed5bf263 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -14,7 +14,7 @@  endif
 generate_doxygen = py3 + files('generate_doxygen.py')
 generate_examples = py3 + files('generate_examples.py')
 
-htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
+htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk', 'api')
 
 # due to the following bug: https://github.com/mesonbuild/meson/issues/4107
 # if install is set to true it will override build_by_default and it will
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 04bfbd1326..8c75beb1c1 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -12,7 +12,7 @@  if get_option('werror')
     extra_sphinx_args += '-W'
 endif
 
-htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
+htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk', 'guides')
 html_guides = custom_target('html_guides',
         input: files('index.rst'),
         output: 'html',