diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-17 15:45:32 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-17 15:45:32 +0000 |
| commit | 4d5c6f45e47fc04f2b18eb8d6e0f4997d5b89c59 (patch) | |
| tree | 3a4cb2dad9871eec21a997b4644a2ee5b759b166 | |
| parent | fc055e7c304efc32cd6ddd7824c369f191baa4d8 (diff) | |
| parent | 1c53902e2712633e042fb5601dc1f3eb396c709c (diff) | |
| download | gobject-introspection-4d5c6f45e47fc04f2b18eb8d6e0f4997d5b89c59.tar.gz | |
Merge branch 'remove-bit-of-old-autoconf' into 'master'
Remove old autoconf fallback code for the python tools.
See merge request GNOME/gobject-introspection!221
| -rwxr-xr-x | tools/g-ir-tool-template.in | 9 | ||||
| -rw-r--r-- | tools/meson.build | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in index c4a10a28..75bf759c 100755 --- a/tools/g-ir-tool-template.in +++ b/tools/g-ir-tool-template.in @@ -53,14 +53,9 @@ if not os.path.isdir(os.path.join(datadir, 'gir-1.0')): builtins.__dict__['DATADIR'] = datadir -# Respect gir_dir_prefix for meson and autotools +# Respect gir_dir_prefix girdir = '' -# for meson -if '@gir_dir_prefix@' and not '@gir_dir_prefix@'.startswith('@'): - girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) -# for autotools -elif '@GIR_DIR@' and not '@GIR_DIR@'.startswith('@'): - girdir = os.path.dirname(os.path.abspath('@GIR_DIR@')) +girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) builtins.__dict__['GIRDIR'] = [girdir] # Again, relative paths first so that the installation prefix is relocatable diff --git a/tools/meson.build b/tools/meson.build index 103480c4..2d67d6ef 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -22,7 +22,6 @@ foreach tool : tools tools_conf.set('datarootdir', datadir_abs) tools_conf.set('gir_dir_prefix', gir_dir_prefix) tools_conf.set('PYTHON_CMD', python_cmd) - tools_conf.set('GIR_DIR', girdir) tools_conf.set('TOOL_MODULE', tool[1]) tools_conf.set('TOOL_FUNCTION', tool[2]) @@ -75,4 +74,4 @@ girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', install: true, c_args: custom_c_args, ) -meson.override_find_program('g-ir-inspect', girinspect)
\ No newline at end of file +meson.override_find_program('g-ir-inspect', girinspect) |