From 0db7395ef9fca96d5a3f2bb3098a5764b44b8fbb Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 27 Dec 2023 16:00:06 +0000
Subject: [PATCH] build: Tell gi-docgen where to find the GIR files

Now that all files are located under top_srcdir/introspection, we need
to ensure that gi-docgen can find them.
---
 docs/reference/gio/meson.build     | 3 ---
 docs/reference/glib/meson.build    | 1 -
 docs/reference/gmodule/meson.build | 2 --
 docs/reference/gobject/meson.build | 1 -
 docs/reference/meson.build         | 1 +
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index b8b93228d..0e6cbac03 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -52,9 +52,6 @@ custom_target('gio-docs',
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
-    '--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 a4197a92f..de4e97a68 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -109,7 +109,6 @@ 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 eb75a0506..1bf2fd21f 100644
--- a/docs/reference/gmodule/meson.build
+++ b/docs/reference/gmodule/meson.build
@@ -14,8 +14,6 @@ custom_target('gmodule-docs',
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
-    '--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 03355b7dc..e96595b37 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -41,7 +41,6 @@ custom_target('gobject-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/meson.build b/docs/reference/meson.build
index b583278f8..acdc70814 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -12,6 +12,7 @@ if get_option('documentation') and enable_gir
     '--quiet',
     '--no-namespace-dir',
     '--fatal-warnings',
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../introspection'),
   ]
 
   docs_dir = glib_datadir / 'doc' / 'glib-2.0'