From 36fba5f00442e451981ee2c422cd54b5e0eb5863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Wed, 10 Apr 2024 14:23:55 +0200 Subject: [PATCH] meson: Use project's mkdevkit.py when subproject --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5c6913069..959bb1749 100644 --- a/meson.build +++ b/meson.build @@ -514,7 +514,11 @@ if get_option('devkits').length() != 0 if get_option('default_library') != 'static' error('Devkits can only be generated from static libraries') endif - mkdevkit = find_program('./releng/mkdevkit.py') + releng = meson.global_source_root() / 'releng' + if not import('fs').exists(releng) + releng = meson.project_source_root() / 'releng' + endif + mkdevkit = find_program(releng / 'mkdevkit.py') uninstalled_dir = meson.global_build_root() / 'meson-uninstalled' devkit_options = [ '--cc', '>>>', cc.cmd_array(), '<<<',