From 2d198c1af92c6776a3de90fffe82b92b889b2526 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sun, 4 Jul 2021 12:56:07 -0400
Subject: [PATCH] libmakepkg: allow correctly sourcing when $LIBRARY is not set

We usually set this up to default to the build time configured install
location, but a couple of files crept in without this.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
 scripts/libmakepkg/buildenv.sh.in      | 2 ++
 scripts/libmakepkg/executable.sh.in    | 2 ++
 scripts/libmakepkg/util/pkgbuild.sh.in | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in
index b75d792a..6605788b 100644
--- a/scripts/libmakepkg/buildenv.sh.in
+++ b/scripts/libmakepkg/buildenv.sh.in
@@ -22,6 +22,8 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return
 LIBMAKEPKG_BUILDENV_SH=1
 
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
 declare -a buildenv_functions build_options
 
 for lib in "$LIBRARY/buildenv/"*.sh; do
diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in
index ea40289b..dfa8a0bd 100644
--- a/scripts/libmakepkg/executable.sh.in
+++ b/scripts/libmakepkg/executable.sh.in
@@ -21,6 +21,8 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_SH=1
 
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
 declare -a executable_functions
 
 for lib in "$LIBRARY/executable/"*.sh; do
diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in
index c52b3eb6..7aab7053 100644
--- a/scripts/libmakepkg/util/pkgbuild.sh.in
+++ b/scripts/libmakepkg/util/pkgbuild.sh.in
@@ -21,6 +21,8 @@
 [[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return
 LIBMAKEPKG_UTIL_PKGBUILD_SH=1
 
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
 source "$LIBRARY/util/schema.sh"