update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / doc / guides / meson.build

diff --git a/ceph/src/spdk/dpdk/doc/guides/meson.build b/ceph/src/spdk/dpdk/doc/guides/meson.build
index 06f14882bb9519cc482335c33a0df674311af535..732e7ad3a9bb9ed427d65856c1540a6c244643ef 100644 (file)
--- a/ceph/src/spdk/dpdk/doc/guides/meson.build
+++ b/ceph/src/spdk/dpdk/doc/guides/meson.build
@@ -3,26 +3,22 @@
 
 sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
 
-if sphinx.found()
-       htmldir = join_paths('share', 'doc', 'dpdk')
-       html_guides_build = custom_target('html_guides_build',
-               input: meson.current_source_dir(),
-               output: 'guides',
-               command: [sphinx, '-b', 'html',
-                       '-d', meson.current_build_dir() + '/.doctrees',
-                       '@INPUT@', meson.current_build_dir() + '/guides'],
-               build_by_default: false,
-               install: get_option('enable_docs'),
-               install_dir: htmldir)
+if not sphinx.found()
+       subdir_done()
+endif
 
-       doc_targets += html_guides_build
-       doc_target_names += 'HTML_Guides'
+htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
+html_guides = custom_target('html_guides',
+       input: files('index.rst'),
+       output: 'html',
+       command: [sphinx_wrapper, sphinx, meson.current_source_dir(), meson.current_build_dir()],
+       depfile: '.html.d',
+       build_by_default: get_option('enable_docs'),
+       install: get_option('enable_docs'),
+       install_dir: htmldir)
 
-       # sphinx leaves a .buildinfo in the target directory, which we don't
-       # want to install. Note that sh -c has to be used, otherwise the
-       # env var does not get expanded if calling rm/install directly.
-       meson.add_install_script('sh', '-c',
-               'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinfo')
-       meson.add_install_script('sh', '-c',
-               'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css')
-endif
+install_data(files('custom.css'),
+                       install_dir: join_paths(htmldir,'_static', 'css'))
+
+doc_targets += html_guides
+doc_target_names += 'HTML_Guides'