bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: Make pkgdir a local

Browse source 
Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages.
This shouldn't be visible.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jan Alexander Steffens (heftig) 2019-01-04 13:13:16 +10:00 • committed by Allan McRae
parent 2f15921230
commit c5c7fc7f4a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/makepkg.sh.in
View file

@ -739,7 +739,7 @@ create_debug_package() {
return 0 return 0
fi fi
pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" local pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@"
# check if we have any debug symbols to package # check if we have any debug symbols to package
if dir_is_empty "$pkgdir/usr/lib/debug"; then if dir_is_empty "$pkgdir/usr/lib/debug"; then
@ -923,7 +923,7 @@ restore_package_variables() {
} }
run_single_packaging() { run_single_packaging() {
pkgdir="$pkgdirbase/$pkgname" local pkgdir="$pkgdirbase/$pkgname"
mkdir "$pkgdir" mkdir "$pkgdir"
if [[ -n $1 ]] || (( PKGFUNC )); then if [[ -n $1 ]] || (( PKGFUNC )); then
run_package $1 run_package $1