[folks/wip/nielsdg/meson-fixes: 2/2] meson: Fix the documentation build

[Niels De Graef <nielsdg src gnome org>]

commit f70f616b20e7fdd5d7622999a9ececac373d3e4f
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Tue Dec 24 11:55:40 2019 +0100

    meson: Fix the documentation build
    
    * Fix the devhelp docs install path
    * Use the @OUTDIR@ variable
    * Fix the build for gtkdoc documentation
    
    Fixes https://gitlab.gnome.org/GNOME/folks/issues/117

 docs/devhelp/meson.build | 5 +++--
 docs/gtkdoc/meson.build  | 8 ++++----
 docs/meson.build         | 6 ++----
 3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/docs/devhelp/meson.build b/docs/devhelp/meson.build
index 968a9482..36386419 100644
--- a/docs/devhelp/meson.build
+++ b/docs/devhelp/meson.build
@@ -6,11 +6,12 @@ foreach doc_target : valadoc_targets
     input: doc_target.get('source_files'),
     output: doc_name,
     command: [ valadoc,
-      '-o', meson.current_build_dir() / doc_name,
+      '--doclet=devhelp',
+      '--directory', '@OUTDIR@',
+      '--package-name', doc_name,
       docs_common_valadoc_flags,
       docs_common_valadoc_deps,
       doc_target.get('dependencies'),
-      '--doclet=devhelp',
       '--wiki=@0@'.format(meson.current_source_dir() / '..' / 'wiki'),
       '@INPUT@',
     ],
diff --git a/docs/gtkdoc/meson.build b/docs/gtkdoc/meson.build
index 1b0ae7d4..c756e4d6 100644
--- a/docs/gtkdoc/meson.build
+++ b/docs/gtkdoc/meson.build
@@ -6,13 +6,13 @@ foreach doc_target : valadoc_targets
     input: doc_target.get('source_files'),
     output: doc_name,
     command: [ valadoc,
-      '-X', '-l', '-X', libfolks_lib.full_path(),
-      '-X', '-l', '-X', doc_target.get('library').full_path(),
-      '-o', meson.current_build_dir() / doc_name,
+      '--doclet=gtkdoc',
+      '--directory', '@OUTDIR@' / doc_name,
+      '--package-name', doc_name,
       docs_common_valadoc_flags,
       docs_common_valadoc_deps,
       doc_target.get('dependencies'),
-      '--doclet=gtkdoc',
+      '-X', meson.build_root() / 'folks' / 'folks' / 'folks.h',
       '@INPUT@',
      ],
     depends: doc_target.get('library'),
diff --git a/docs/meson.build b/docs/meson.build
index 20252bcf..4d5ae34b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -3,7 +3,7 @@ docs_common_valadoc_flags = [
   '--force',
   '--package-version', meson.project_version(),
   '--no-protected',
-  '-X', meson.build_root() / 'folks' / 'folks.h',
+  '-X', meson.build_root() / 'folks' / 'folks' / 'folks.h',
 ]
 
 docs_common_valadoc_deps = [
@@ -65,6 +65,4 @@ endif
 subdir('devhelp')
 
 # Second, the gtk-doc module
-# FIXME: for some reason, this is broken due to the gtkdoc module not finding
-# the folks header
-# subdir('gtkdoc')
+subdir('gtkdoc')