|
|
@@ -81,6 +81,13 @@ build_invercargill_json() {
|
|
|
|
|
|
pushd "$src_dir" >/dev/null || return 1
|
|
|
|
|
|
+ # Set PKG_CONFIG_PATH to find bundled Invercargill library
|
|
|
+ export PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
|
|
|
+
|
|
|
+ # Set XDG_DATA_DIRS for GObject Introspection and Vala to find .gir and .vapi files
|
|
|
+ # Include default system paths to ensure system vapi files are found
|
|
|
+ export XDG_DATA_DIRS="$prefix/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}:/usr/local/share:/usr/share"
|
|
|
+
|
|
|
# Configure with meson (force libdir=lib for consistency across platforms)
|
|
|
if ! meson setup src builddir --prefix="$prefix" --libdir=lib -Ddefault_library=static >"$output_redirect" 2>&1; then
|
|
|
log_error "Failed to configure Invercargill-Json"
|
|
|
@@ -121,6 +128,10 @@ build_usm() {
|
|
|
# Set PKG_CONFIG_PATH to find bundled Invercargill libraries
|
|
|
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
|
|
|
|
|
|
+ # Set XDG_DATA_DIRS for GObject Introspection and Vala to find .gir and .vapi files
|
|
|
+ # Include default system paths to ensure system vapi files are found
|
|
|
+ export XDG_DATA_DIRS="$prefix/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}:/usr/local/share:/usr/share"
|
|
|
+
|
|
|
# Configure with meson (USM's meson.build is at root, force libdir=lib for consistency)
|
|
|
if ! meson setup builddir --prefix="$prefix" --libdir=lib >"$output_redirect" 2>&1; then
|
|
|
log_error "Failed to configure USM"
|