aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klumpp <matthias@tenstral.net>2017-08-29 01:45:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-29 18:38:07 +0300
commitd49eeb243f49d57e6c69ff61354556897fbe8ed5 (patch)
treee32ff1b9f340c46ff9cf77cde6eb26b5a4df6279
parentd220683787182923a06525fe46e636b9c5d88ec0 (diff)
downloadmeson-d49eeb243f49d57e6c69ff61354556897fbe8ed5.zip
meson-d49eeb243f49d57e6c69ff61354556897fbe8ed5.tar.gz
meson-d49eeb243f49d57e6c69ff61354556897fbe8ed5.tar.bz2
gnome: Fix typo in gtkdoc_html_dir, so it returns the correct path
-rw-r--r--mesonbuild/modules/gnome.py2
-rw-r--r--test cases/frameworks/10 gtk-doc/meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 1632dae..ababb8c 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -804,7 +804,7 @@ class GnomeModule(ExtensionModule):
modulename = args[0]
if not isinstance(modulename, str):
raise MesonException('Argument must be a string')
- return ModuleReturnValue(os.path.join('share/gtkdoc/html', modulename), [])
+ return ModuleReturnValue(os.path.join('share/gtk-doc/html', modulename), [])
@staticmethod
def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None):
diff --git a/test cases/frameworks/10 gtk-doc/meson.build b/test cases/frameworks/10 gtk-doc/meson.build
index 4cfcca1..e5e7705 100644
--- a/test cases/frameworks/10 gtk-doc/meson.build
+++ b/test cases/frameworks/10 gtk-doc/meson.build
@@ -2,7 +2,7 @@ project('gtkdoctest', 'c', version : '1.0.0')
gnome = import('gnome')
-assert(gnome.gtkdoc_html_dir('foobar') == 'share/gtkdoc/html/foobar', 'Gtkdoc install dir is incorrect.')
+assert(gnome.gtkdoc_html_dir('foobar') == 'share/gtk-doc/html/foobar', 'Gtkdoc install dir is incorrect.')
inc = include_directories('include')