abuild: move the pkgdir to pkg/<name>
where <pkg> is package/subpackage name
This commit is contained in:
parent
f3857a4d93
commit
4aee935d8c
5
abuild
5
abuild
@ -12,7 +12,7 @@ abuild_ver=1.14
|
|||||||
|
|
||||||
startdir="$PWD"
|
startdir="$PWD"
|
||||||
srcdir=${srcdir:-"$startdir/src"}
|
srcdir=${srcdir:-"$startdir/src"}
|
||||||
pkgdir=${pkgdir:-"$startdir/pkg"}
|
pkgdirbase=${pkgdirbase:-"$startdir/pkg"}
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
repo=${startdir%/*}
|
repo=${startdir%/*}
|
||||||
repo=${repo##*/}
|
repo=${repo##*/}
|
||||||
@ -260,7 +260,7 @@ subpkg() {
|
|||||||
local func=$(get_split_func $i)
|
local func=$(get_split_func $i)
|
||||||
# call abuild recursively, setting subpkg{dir,name}
|
# call abuild recursively, setting subpkg{dir,name}
|
||||||
msg "Running split function $func..."
|
msg "Running split function $func..."
|
||||||
subpkgdir="$startdir/pkg-$func" subpkgname="${i%:*}" \
|
subpkgdir="$pkgdirbase/${i%:*}" subpkgname="${i%:*}" \
|
||||||
$0 $func package || return 1
|
$0 $func package || return 1
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -800,6 +800,7 @@ if [ -n "$subpkgname" ]; then
|
|||||||
subpackages=
|
subpackages=
|
||||||
install=
|
install=
|
||||||
fi
|
fi
|
||||||
|
pkgdir="${pkgdirbase}/$pkgname"
|
||||||
|
|
||||||
trap 'die "Aborted by user"' INT
|
trap 'die "Aborted by user"' INT
|
||||||
set_xterm_title "abuild: $pkgname"
|
set_xterm_title "abuild: $pkgname"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user