From e84c9e75efc9d82262a5ec6036cc737c6089ab30 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 24 Nov 2017 02:29:01 +0530 Subject: g-ir-scanner: Don't require SRCDIR and BUILDDIR env vars When building with Meson, we cannot set environment variables while running custom targets and our builddir layout is different from Autotools anyway. Now g-ir-scanner and friends can autodetect when they're being run uninstalled by Meson and will find _giscanner.so and the giscanner python files in the build directory. This is very similar to what gdbus-codegen uses in glib/gio. Same for girepository/gdump.c. --- giscanner/meson.build | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'giscanner/meson.build') 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) -- cgit v1.2.1