From 4aee935d8c8d9410f3557be7bc3ee4bce639a6e5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 8 May 2009 12:44:01 +0000
Subject: abuild: move the pkgdir to pkg/<name>

where <pkg> is package/subpackage name
---
 abuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/abuild b/abuild
index 0f291ce..8f1e040 100755
--- a/abuild
+++ b/abuild
@@ -12,7 +12,7 @@ abuild_ver=1.14
 
 startdir="$PWD"
 srcdir=${srcdir:-"$startdir/src"}
-pkgdir=${pkgdir:-"$startdir/pkg"}
+pkgdirbase=${pkgdirbase:-"$startdir/pkg"}
 pkgrel=0
 repo=${startdir%/*}
 repo=${repo##*/}
@@ -260,7 +260,7 @@ subpkg() {
 		local func=$(get_split_func $i)
 		# call abuild recursively, setting subpkg{dir,name}
 		msg "Running split function $func..."
-		subpkgdir="$startdir/pkg-$func" subpkgname="${i%:*}" \
+		subpkgdir="$pkgdirbase/${i%:*}" subpkgname="${i%:*}" \
 			$0 $func package || return 1
 	done
 }
@@ -800,6 +800,7 @@ if [ -n "$subpkgname" ]; then
 	subpackages=
 	install=
 fi
+pkgdir="${pkgdirbase}/$pkgname"
 
 trap 'die "Aborted by user"' INT
 set_xterm_title "abuild: $pkgname"
-- 
cgit v1.2.3-60-g2f50