summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-09-23 14:02:29 +0200
committerAllan McRae <allan@archlinux.org>2012-11-27 06:16:15 +0100
commita53fd796326727e3a891413762725cd4450bf986 (patch)
treebdc48e9af5012291ba6ccf96451736087d8182a7
parent6be96e7612877adb76fcf7b212765c387388597d (diff)
downloadpacman-a53fd796326727e3a891413762725cd4450bf986.tar.gz
pacman-a53fd796326727e3a891413762725cd4450bf986.tar.xz
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 <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 6 insertions, 0 deletions
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