diff options
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/dumper.py | 7 | ||||
| -rw-r--r-- | giscanner/meson.build | 17 |
2 files changed, 18 insertions, 6 deletions
diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 3c7220bc..8d255bfc 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -116,8 +116,11 @@ class DumpCompiler(object): if self._uninst_srcdir is not None: gdump_path = os.path.join(self._uninst_srcdir, 'girepository', 'gdump.c') else: - gdump_path = os.path.join(os.path.join(DATADIR), 'gobject-introspection-1.0', - 'gdump.c') + try: + gdump_path = GDUMP_PATH + except NameError: + gdump_path = os.path.join(os.path.join(DATADIR), + 'gobject-introspection-1.0', 'gdump.c') if not os.path.isfile(gdump_path): raise SystemExit("Couldn't find %r" % (gdump_path, )) with open(gdump_path) as gdump_file: diff --git a/giscanner/meson.build b/giscanner/meson.build index acf14863..5357ae52 100644 --- a/giscanner/meson.build +++ b/giscanner/meson.build @@ -1,6 +1,4 @@ -pkglibdir = join_paths(get_option('libdir'), meson.project_name()) -giscannerdir = join_paths(pkglibdir, 'giscanner') -install_data([ +giscanner_files = [ '__init__.py', 'annotationmain.py', 'annotationparser.py', @@ -27,8 +25,19 @@ install_data([ 'transformer.py', 'utils.py', 'xmlwriter.py', -], install_dir: giscannerdir) +] + +pkglibdir = join_paths(get_option('libdir'), meson.project_name()) +giscannerdir = join_paths(pkglibdir, 'giscanner') +giscanner_built_files = [] +blank_conf = configuration_data() +foreach f : giscanner_files + giscanner_built_files += configure_file(input : f, output : f, + install : true, + install_dir : giscannerdir, + configuration : blank_conf) +endforeach install_subdir('doctemplates', install_dir: giscannerdir) |