From f2788244d322ca5ac45482d25747fe56176b72af Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 31 May 2018 18:24:47 +0200 Subject: 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 --- scripts/makepkg.sh.in | 4 +--- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3-54-g00ecf