From c5c7fc7f4a361a9a347845b930030077898cd83f Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Fri, 4 Jan 2019 13:13:16 +1000 Subject: makepkg: Make pkgdir a local Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages. This shouldn't be visible. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e3a392d4..237d1cdb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -739,7 +739,7 @@ create_debug_package() { return 0 fi - pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" + local pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then @@ -923,7 +923,7 @@ restore_package_variables() { } run_single_packaging() { - pkgdir="$pkgdirbase/$pkgname" + local pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" if [[ -n $1 ]] || (( PKGFUNC )); then run_package $1 -- cgit v1.2.3-70-g09d2