abuild: set default builddir when not defined in APKBUILD

4f37c8ef · Jakub Jirutka <[email protected]> · 2016-08-20 16:22:22 +02:00

Changes

1 files changed · +3 −2

File	Status	Add	Del	Content
abuild.in	modified	+3	−2	View file

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"