From 3dbef3223b1d2d3e99b5dc50bf32cfd1d4ba00ad Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu, 2 Nov 2023 11:14:56 +0000
Subject: [PATCH] build: Fix the inclusion paths for GIR files in gi-docgen

The GIR files are now built by GLib itself, so they will be in the build
directories of each sub-library, except for GLib-2.0 which is built
alongside GObject-2.0.
---
 docs/reference/gio/meson.build     | 5 +++--
 docs/reference/glib/meson.build    | 1 +
 docs/reference/gmodule/meson.build | 3 ++-
 docs/reference/gobject/meson.build | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index 0c4991377..38cdc6a06 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -244,8 +244,9 @@ custom_target('gio-docs',
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
-    '--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
-    '--add-include-path=@0@'.format(meson.current_source_dir() / '../gobject'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gmodule'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gio'),
     '@INPUT1@',
   ],
   build_by_default: true,
diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
index 9caed86ed..cf4d95657 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -178,6 +178,7 @@ custom_target('glib-docs',
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
     '@INPUT1@',
   ],
   build_by_default: true,
diff --git a/docs/reference/gmodule/meson.build b/docs/reference/gmodule/meson.build
index f8351e546..ac324d672 100644
--- a/docs/reference/gmodule/meson.build
+++ b/docs/reference/gmodule/meson.build
@@ -14,7 +14,8 @@ custom_target('gmodule-docs',
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
-    '--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gmodule'),
     '@INPUT1@',
   ],
   build_by_default: true,
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index 945e16a35..9cc9db619 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -89,7 +89,7 @@ custom_target('gobject-docs',
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
-    '--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
     '@INPUT1@',
   ],
   build_by_default: true,