summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2020-06-24 15:37:28 +0100
committerRichard Hughes <richard@hughsie.com>2020-06-24 16:12:35 +0100
commit4a86b0843969b96c3ba443903ef01b2cc572e11a (patch)
tree9647777d9ee2fb245eeacec0367d119e51419a4d
parenta81f8180e19c52660b732f93ada02d304e290430 (diff)
downloadgusb-4a86b0843969b96c3ba443903ef01b2cc572e11a.tar.gz
Allow building GtkDoc when building as a subproject
Fixes https://github.com/fwupd/fwupd/issues/2178
-rw-r--r--docs/api/meson.build4
-rw-r--r--gusb/meson.build3
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/api/meson.build b/docs/api/meson.build
index 1bdcb1d..13002db 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -7,8 +7,8 @@ gusb_version_xml = configure_file(
gnome.gtkdoc(
'gusb',
src_dir : [
- join_paths(meson.source_root(), 'gusb'),
- join_paths(meson.build_root(), 'gusb'),
+ gusb_source_dir,
+ gusb_build_dir,
],
main_sgml : 'gusb-docs.sgml',
install : true
diff --git a/gusb/meson.build b/gusb/meson.build
index 28ca3c6..34c35fb 100644
--- a/gusb/meson.build
+++ b/gusb/meson.build
@@ -3,6 +3,9 @@ cargs = [
'-DUSB_IDS="' + get_option('usb_ids') + '"',
]
+gusb_source_dir = meson.current_source_dir()
+gusb_build_dir = meson.current_build_dir()
+
con2 = configuration_data()
con2.set('G_USB_MAJOR_VERSION', gusb_major_version)
con2.set('G_USB_MINOR_VERSION', gusb_minor_version)