summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-10-09 13:20:11 +1000
committerAllan McRae <allan@archlinux.org>2013-10-14 13:01:01 +1000
commit141d7f234f9a34c346b0b1d8edf4a35bc53b739d (patch)
treeba0fca4a6aab9c32111d24e3dc3fa2a716317ce5
parent043f250d0e93f07be60a94c92a027d6f61fc9158 (diff)
downloadpacman-141d7f234f9a34c346b0b1d8edf4a35bc53b739d.tar.xz
makepkg: do not refer to src/ or pkg/
Use $srcdir and $pkgdir instead. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 86f7edbd..ec18c2be 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1836,7 +1836,7 @@ write_pkginfo() {
create_package() {
if [[ ! -d $pkgdir ]]; then
- error "$(gettext "Missing %s directory.")" "pkg/"
+ error "$(gettext "Missing %s directory.")" "\$pkgdir/"
plain "$(gettext "Aborting...")"
exit 1 # $E_MISSING_PKGDIR
fi
@@ -2973,14 +2973,14 @@ chmod a-s "$srcdir"
cd_safe "$srcdir"
if (( NOEXTRACT && ! VERIFYSOURCE )); then
- warning "$(gettext "Using existing %s tree")" "src/"
+ warning "$(gettext "Using existing %s tree")" "\$srcdir/"
elif (( !REPKG )); then
download_sources
check_source_integrity
(( VERIFYSOURCE )) && exit 0 # $E_OK
if (( CLEANBUILD )); then
- msg "$(gettext "Removing existing %s directory...")" "src/"
+ msg "$(gettext "Removing existing %s directory...")" "\$srcdir/"
rm -rf "$srcdir"/*
fi
@@ -2996,7 +2996,7 @@ if (( NOBUILD )); then
else
# clean existing pkg directory
if [[ -d $pkgdirbase ]]; then
- msg "$(gettext "Removing existing %s directory...")" "pkg/"
+ msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/"
rm -rf "$pkgdirbase"
fi
mkdir -p "$pkgdirbase"