From: Bruce Richardson Date: Tue, 29 Sep 2020 16:54:58 +0000 (+0100) Subject: doc: align doxygen output folder with sphinx guides X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=b1fa45491fda74c7bc4d3c99e5eaa2994c88a1b3;p=dpdk.git doc: align doxygen output folder with sphinx guides The API docs were output to "/doc/api/api" folder, which was ugly-looking with the repeated "api", and inconsistent with the sphinx guides which were written to "/doc/guides/html". Changing the doxygen output folder to "html" fixes both these issues. Signed-off-by: Bruce Richardson --- diff --git a/doc/api/meson.build b/doc/api/meson.build index 49d5b9a153..e9b49f9c2f 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -34,7 +34,7 @@ cdata = configuration_data() cdata.set('VERSION', meson.project_version()) cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples.dox')) cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) -cdata.set('HTML_OUTPUT', 'api') +cdata.set('HTML_OUTPUT', 'html') cdata.set('TOPDIR', meson.source_root()) cdata.set('STRIP_FROM_PATH', meson.source_root()) @@ -45,8 +45,8 @@ doxy_conf = configure_file(input: 'doxy-api.conf.in', doxy_build = custom_target('doxygen', depends: example, input: doxy_conf, - output: 'api', - depfile: 'api.d', + output: 'html', + depfile: 'html.d', command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css], install: get_option('enable_docs'), install_dir: htmldir,