From 4f37c8efd306335a9c3ac6862b0984c965bf270f Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 20 Aug 2016 16:22:22 +0200 Subject: [PATCH] abuild: set default builddir when not defined in APKBUILD --- abuild.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/abuild.in b/abuild.in index 5dd0423..35b7995 100644 --- a/abuild.in +++ b/abuild.in @@ -568,8 +568,7 @@ default_prepare() { if ! have_patches; then return 0 fi - cd "${builddir:-$srcdir/$pkgname-$pkgver}" \ - || { error "Is \$builddir set correctly?"; return 1; } + cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } for i in $source; do case $i in *.patch) @@ -2239,6 +2238,8 @@ export CC cd "$startdir" || die . "$APKBUILD" +builddir=${builddir:-"$srcdir/$pkgname-$pkgver"} + # If REPODEST is set then it will override the PKGDEST if [ -z "$REPODEST" ]; then warning "REPODEST is not set and is now required. Defaulting to ~/packages"