diff options
Diffstat (limited to 'abuild.in')
| -rwxr-xr-x | abuild.in | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -13,7 +13,7 @@ sysconfdir=@sysconfdir@ startdir="$PWD" srcdir=${srcdir:-"$startdir/src"} -pkgdirbase=${pkgdirbase:-"$startdir/pkg"} +pkgbasedir=${pkgbasedir:-"$startdir/pkg"} pkgrel=0 repo=${startdir%/*} repo=${repo##*/} @@ -213,7 +213,7 @@ unpack() { clean() { msg "Cleaning temporary build dirs..." rm -rf "$srcdir" - rm -rf "$pkgdirbase" + rm -rf "$pkgbasedir" } # cleanup fetched sources @@ -279,7 +279,7 @@ prepare_subpackages() { local func=$(get_split_func $i) # call abuild recursively, setting subpkg{dir,name} msg "Running split function $func..." - subpkgdir="$pkgdirbase/${i%:*}" subpkgname="${i%:*}" \ + subpkgdir="$pkgbasedir/${i%:*}" subpkgname="${i%:*}" \ $0 $func prepare_package || return 1 done } @@ -379,7 +379,7 @@ pkginfo_val() { create_apks() { local file - for file in "$pkgdirbase"/*/.PKGINFO; do + for file in "$pkgbasedir"/*/.PKGINFO; do local dir="${file%/.PKGINFO}" local name=$(pkginfo_val pkgname $file) local ver=$(pkginfo_val pkgver $file) @@ -841,7 +841,7 @@ if [ -n "$subpkgname" ]; then subpackages= install= fi -pkgdir="${pkgdirbase}/$pkgname" +pkgdir="$pkgbasedir/$pkgname" trap 'die "Aborted by user"' INT set_xterm_title "abuild: $pkgname" |