diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-07-04 12:56:07 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2021-08-04 21:59:32 +1000 |
| commit | 2d198c1af92c6776a3de90fffe82b92b889b2526 (patch) | |
| tree | 57b6a7a6560398897d2df00713f917d00442a82c /scripts | |
| parent | 82aaee1a5ca8e5e7da453975a4b29bf880f588d2 (diff) | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/libmakepkg/buildenv.sh.in | 2 | ||||
| -rw-r--r-- | scripts/libmakepkg/executable.sh.in | 2 | ||||
| -rw-r--r-- | scripts/libmakepkg/util/pkgbuild.sh.in | 2 |
3 files changed, 6 insertions, 0 deletions
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" |