[glib: 2/6] ci: Fix dist-job missing gobject/gio documentation

[Philip Withnall <pwithnall src gnome org>]

commit 543a9c4f3386df3f64f36101b52923103f008903
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Mon Jun 18 09:47:39 2018 -0400

    ci: Fix dist-job missing gobject/gio documentation
    
    This requires meson >= 0.47.0 otherwise building the doc fails:
    https://github.com/mesonbuild/meson/issues/3379
    
    While at it, no need to to pass --prefix --libdir to meson, other CIs
    don't have them.

 .gitlab-ci.yml | 4 ++--
 meson.build    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b9461328..399804002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,10 +120,10 @@ dist-job:
   only:
     - tags
   script:
-    - meson --prefix /usr --libdir /usr/lib64 --buildtype release -Dgtk_doc=true -Dman=true _build .
+    - meson --buildtype release -Dgtk_doc=true -Dman=true _build
     - cd _build
     - ninja dist
-    - ninja glib-doc
+    - ninja glib-doc gobject-doc gio-doc
     - tar -c -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html
     - tar -c -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html
     - tar -c -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html
diff --git a/meson.build b/meson.build
index ef17ba309..6c3dcc6a5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('glib', 'c', 'cpp',
   version : '2.57.1',
-  meson_version : '>= 0.46.1',
+  meson_version : '>= 0.47.0',
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=1',