moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Allan McRae 2012-09-23 22:02:29 +10:00
parent 6be96e7612
commit a53fd79632
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/makepkg.sh.in
View File

@ -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