[libcamera-devel,2/6] Documentation: Set install_dir in custom_target()

Message ID 20181211191011.6315-3-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • Documentation: Initial Doxygen support
Related show

Commit Message

Laurent Pinchart Dec. 11, 2018, 7:10 p.m. UTC
The custom_target() function accepts an install_dir parameter. Along
with setting install to true, this can be used to replace the
install_subdir() function.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 Documentation/meson.build | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/Documentation/meson.build b/Documentation/meson.build
index 578c1cae65f5..49e6f3742ffe 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -14,8 +14,7 @@  if sphinx.found()
                   command: [sphinx, '-W', '-b', 'html', meson.current_source_dir(), '@OUTPUT@'],
                   input: docs_sources,
                   output: 'html',
-                  build_by_default: true)
-
-    install_subdir(meson.current_build_dir() + '/html',
-                   install_dir: 'share/doc/libcamera-@0@'.format(api_version))
+                  build_by_default: true,
+                  install: true,
+                  install_dir: 'share/doc/libcamera-@0@'.format(api_version))
 endif