From d49eeb243f49d57e6c69ff61354556897fbe8ed5 Mon Sep 17 00:00:00 2001 From: Matthias Klumpp Date: Tue, 29 Aug 2017 01:45:26 +0200 Subject: gnome: Fix typo in gtkdoc_html_dir, so it returns the correct path --- mesonbuild/modules/gnome.py | 2 +- test cases/frameworks/10 gtk-doc/meson.build | 2 +- 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') -- cgit v1.1