diff options
| -rw-r--r-- | mesonbuild/envconfig.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 2af45bf..29b41d5 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -118,6 +118,7 @@ ENV_VAR_PROG_MAP: T.Mapping[str, str] = { 'qmake': 'QMAKE', 'pkgconfig': 'PKG_CONFIG', 'make': 'MAKE', + 'vapigen': 'VAPIGEN', } # Deprecated environment variables mapped from the new variable to the old one diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0a001d8..61cfe88 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1788,10 +1788,7 @@ G_END_DECLS''' source_dir = os.path.join(state.environment.get_source_dir(), state.subdir) pkg_cmd, vapi_depends, vapi_packages, vapi_includes = self._extract_vapi_packages(state, kwargs) cmd: T.List[T.Union[str, 'ExternalProgram']] - if 'VAPIGEN' in os.environ: - cmd = [state.find_program(os.environ['VAPIGEN'])] - else: - cmd = [state.find_program('vapigen')] + cmd = [state.find_program('vapigen')] cmd += ['--quiet', '--library=' + library, '--directory=' + build_dir] cmd += self._vapi_args_to_command('--vapidir=', 'vapi_dirs', kwargs) cmd += self._vapi_args_to_command('--metadatadir=', 'metadata_dirs', kwargs) |