makepkg: do not refer to src/ or pkg/
Use $srcdir and $pkgdir instead. Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
043f250d0e
commit
141d7f234f
@ -1836,7 +1836,7 @@ write_pkginfo() {
|
|||||||
|
|
||||||
create_package() {
|
create_package() {
|
||||||
if [[ ! -d $pkgdir ]]; then
|
if [[ ! -d $pkgdir ]]; then
|
||||||
error "$(gettext "Missing %s directory.")" "pkg/"
|
error "$(gettext "Missing %s directory.")" "\$pkgdir/"
|
||||||
plain "$(gettext "Aborting...")"
|
plain "$(gettext "Aborting...")"
|
||||||
exit 1 # $E_MISSING_PKGDIR
|
exit 1 # $E_MISSING_PKGDIR
|
||||||
fi
|
fi
|
||||||
@ -2973,14 +2973,14 @@ chmod a-s "$srcdir"
|
|||||||
cd_safe "$srcdir"
|
cd_safe "$srcdir"
|
||||||
|
|
||||||
if (( NOEXTRACT && ! VERIFYSOURCE )); then
|
if (( NOEXTRACT && ! VERIFYSOURCE )); then
|
||||||
warning "$(gettext "Using existing %s tree")" "src/"
|
warning "$(gettext "Using existing %s tree")" "\$srcdir/"
|
||||||
elif (( !REPKG )); then
|
elif (( !REPKG )); then
|
||||||
download_sources
|
download_sources
|
||||||
check_source_integrity
|
check_source_integrity
|
||||||
(( VERIFYSOURCE )) && exit 0 # $E_OK
|
(( VERIFYSOURCE )) && exit 0 # $E_OK
|
||||||
|
|
||||||
if (( CLEANBUILD )); then
|
if (( CLEANBUILD )); then
|
||||||
msg "$(gettext "Removing existing %s directory...")" "src/"
|
msg "$(gettext "Removing existing %s directory...")" "\$srcdir/"
|
||||||
rm -rf "$srcdir"/*
|
rm -rf "$srcdir"/*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2996,7 +2996,7 @@ if (( NOBUILD )); then
|
|||||||
else
|
else
|
||||||
# clean existing pkg directory
|
# clean existing pkg directory
|
||||||
if [[ -d $pkgdirbase ]]; then
|
if [[ -d $pkgdirbase ]]; then
|
||||||
msg "$(gettext "Removing existing %s directory...")" "pkg/"
|
msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/"
|
||||||
rm -rf "$pkgdirbase"
|
rm -rf "$pkgdirbase"
|
||||||
fi
|
fi
|
||||||
mkdir -p "$pkgdirbase"
|
mkdir -p "$pkgdirbase"
|
||||||
|
Loading…
Reference in New Issue
Block a user