From ddaa2a9ec33f4b48827dd2f1c84b42dff3307a4a Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 15 Aug 2019 09:41:30 -0400 Subject: [PATCH] Make meson.override_find_program working on more complex use cases Add some missing `meson.override_find_program` And make sure that the `.gir` we build are found when used uninstalled as a concequence of `meson.override_find_program`. --- girparser.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/girparser.c b/girparser.c index 53450baf5..fb47e75c2 100644 --- a/girparser.c +++ b/girparser.c @@ -309,6 +309,10 @@ locate_gir (GIrParser *parser, if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) return path; g_free (path); + path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + return path; + g_free (path); return NULL; }