diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-21 21:41:03 +0100 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-23 18:12:57 +0100 |
| commit | 856c3be8c5967076eaf166547f0264560b9e68c0 (patch) | |
| tree | 5ef47b90fffc6f7606616ae36b57e2f353409cfd | |
| parent | 5c61331625ff964dcc42238151d41ba674618986 (diff) | |
| download | libchamplain-856c3be8c5967076eaf166547f0264560b9e68c0.tar.gz | |
meson: Simplify use of gtkdocdir
| -rw-r--r-- | docs/reference/meson.build | 10 | ||||
| -rw-r--r-- | 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 |