From a53fd796326727e3a891413762725cd4450bf986 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 23 Sep 2012 22:02:29 +1000 Subject: makepkg: always use pkg/$pkgname as $pkgdir Unify split and single packages to always use a folder within pkg/ as thier $pkgdir. This will allow a folder for storing a package with stripped debug symbols to be added within pkg/ too. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5f96f08d..26e5d5ba 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2696,6 +2696,8 @@ if (( INFAKEROOT )); then fi if (( ! SPLITPKG )); then + pkgdir="$pkgdir/$pkgname" + mkdir -p "$pkgdir" if (( ! PKGFUNC )); then if (( ! REPKG )); then if (( BUILDFUNC )); then @@ -2711,6 +2713,7 @@ if (( INFAKEROOT )); then fi tidy_install create_package + pkgdir="${pkgdir%/*}" else run_split_packaging fi @@ -2839,6 +2842,8 @@ else (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then + pkgdir="$pkgdir/$pkgname" + mkdir -p "$pkgdir" if (( PKGFUNC )); then run_package elif (( REPKG )); then @@ -2847,6 +2852,7 @@ else fi tidy_install create_package + pkgdir="${pkgdir%/*}" else run_split_packaging fi -- cgit v1.2.3-70-g09d2