Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-05-31 18:24:47 +0200
committerAllan McRae <allan@archlinux.org>2018-08-10 12:37:19 +1000
commitf2788244d322ca5ac45482d25747fe56176b72af (patch)
tree10464cb6a65248189ba8592c962be20bc7ec95d9
parent0cbb128818726e4d41964ea8df8c42ee37697ef7 (diff)
makepkg: Simplify SPLITPKG check
This causes package_$pkgname() to be preferred over package() in the non-split case, but the behavior if both functions exist was undocumented anyway. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 8ee0f5c5..49d9e3ad 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1491,7 +1491,7 @@ fi
# check we have the software required to process the PKGBUILD
check_software || exit $E_MISSING_MAKEPKG_DEPS
-if (( ${#pkgname[@]} > 1 )); then
+if (( ${#pkgname[@]} > 1 )) || have_function package_${pkgname}; then
SPLITPKG=1
fi
@@ -1513,8 +1513,6 @@ if have_function check; then
fi
if have_function package; then
PKGFUNC=1
-elif [[ $SPLITPKG -eq 0 ]] && have_function package_${pkgname}; then
- SPLITPKG=1
fi
# check if gpg signature is to be created and if signing key is valid