Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 25b1dfdc..47b1fd10 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1686,10 +1686,6 @@ if (( GENINTEG )); then
exit 0 # $E_OK
fi
-if [ "$(type -t package)" = "function" ]; then
- PKGFUNC=1
-fi
-
# check the PKGBUILD for some basic requirements
check_sanity || exit 1
@@ -1704,6 +1700,12 @@ if (( ${#pkgname[@]} > 1 )); then
SPLITPKG=1
fi
+if [ "$(type -t package)" = "function" ]; then
+ PKGFUNC=1
+elif [ $SPLITPKG -eq 0 -a "$(type -t package_${pkgname})" = "function" ]; then
+ SPLITPKG=1
+fi
+
pkgbase=${pkgbase:-${pkgname[0]}}
if (( ! SPLITPKG )); then