[libchamplain: 5/8] meson: Simplify use of gtkdocdir
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain: 5/8] meson: Simplify use of gtkdocdir
- Date: Sat, 23 Feb 2019 17:52:00 +0000 (UTC)
commit 856c3be8c5967076eaf166547f0264560b9e68c0
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date: Thu Feb 21 21:41:03 2019 +0100
meson: Simplify use of gtkdocdir
docs/reference/meson.build | 10 ++++------
meson.build | 1 -
2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index c99a57a..781205a 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -10,6 +10,8 @@ clutter_docpath = join_paths(clutter_prefix, 'share', 'gtk-doc', 'html', 'clutte
gtk_prefix = gtk_dep.get_pkgconfig_variable('prefix')
gtk_docpath = join_paths(gtk_prefix, 'share', 'gtk-doc', 'html', 'gtk3')
+gtkdocdir = join_paths(datadir, 'gtk-doc', 'html', package_string)
+
libchamplain_reference_ignored_h = [
'champlain-gtk.h',
'champlain-adjustment.h',
@@ -52,7 +54,7 @@ libchamplain_reference_mkdb_args = [
]
libchamplain_reference_fixxref_args = [
- '--html-dir=@0@'.format(join_paths(gtkdocdir, 'html', package_string)),
+ '--html-dir=@0@'.format(gtkdocdir),
'--extra-dir=@0@'.format(glib_docpath),
'--extra-dir=@0@'.format(gobject_docpath),
'--extra-dir=@0@'.format(clutter_docpath),
@@ -69,9 +71,5 @@ gnome.gtkdoc(
mkdb_args: libchamplain_reference_mkdb_args,
fixxref_args: libchamplain_reference_fixxref_args,
install: true,
- install_dir: join_paths(
- gtkdocdir,
- 'html',
- package_string,
- )
+ install_dir: gtkdocdir,
)
diff --git a/meson.build b/meson.build
index 54cb0e4..73cf9c3 100644
--- a/meson.build
+++ b/meson.build
@@ -53,7 +53,6 @@ typelibdir = join_paths(libdir, 'girepository-1.0')
pkgconfigdir = join_paths(libdir, 'pkgconfig')
girdir = join_paths(datadir, 'gir-1.0')
-gtkdocdir = join_paths(datadir, 'gtk-doc')
vapidir = join_paths(datadir, 'vala', 'vapi')
# Dependencies
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]