From cc1bc16467b255dfde1ccf682d4da3bb53d9da07 Mon Sep 17 00:00:00 2001 From: Andreas Nordal Date: Sun, 9 Aug 2020 16:20:51 +0200 Subject: [PATCH] Attempt to fix opensuse-1175039 While this didn't actually work, please see: https://bugzilla.opensuse.org/show_bug.cgi?id=1175039 --- meson.build | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index bf5904f..a9c1017 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,8 @@ endforeach default_path = [] foreach f : ['libdir', 'datadir'] - default_path += [join_paths(get_option('prefix'), get_option(f), 'pkgconfig')] + default_path += [join_paths('/usr/local', get_option(f), 'pkgconfig')] + default_path += [join_paths('/usr', get_option(f), 'pkgconfig')] endforeach personality_path = [] @@ -34,7 +35,29 @@ endforeach cdata.set_quoted('SYSTEM_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) cdata.set_quoted('SYSTEM_INCLUDEDIR', join_paths(get_option('prefix'), get_option('includedir'))) + + + + + + + + + + +# FIXME: Dunno why this still doesn't work, despite now containing all the right paths. cdata.set_quoted('PKG_DEFAULT_PATH', ':'.join(default_path)) +assert(false, ':'.join(default_path)) + + + + + + + + + + cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path)) cdata.set_quoted('PACKAGE_NAME', meson.project_name()) cdata.set_quoted('PACKAGE_VERSION', meson.project_version()) -- 2.41.0