diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-08 12:44:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-08 12:44:01 +0000 |
| commit | 4aee935d8c8d9410f3557be7bc3ee4bce639a6e5 (patch) | |
| tree | 52ddb2d69d76c880296d95272735c01c62819e7b | |
| parent | f3857a4d93e89eebff617da8aa4a476fd56be185 (diff) | |
| download | abuild-4aee935d8c8d9410f3557be7bc3ee4bce639a6e5.tar.gz abuild-4aee935d8c8d9410f3557be7bc3ee4bce639a6e5.tar.bz2 abuild-4aee935d8c8d9410f3557be7bc3ee4bce639a6e5.tar.xz abuild-4aee935d8c8d9410f3557be7bc3ee4bce639a6e5.zip | |
abuild: move the pkgdir to pkg/<name>
where <pkg> is package/subpackage name
| -rwxr-xr-x | abuild | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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" |