[pacman-dev] [PATCH 1/2] makepkg: do not refer to src/ or pkg/

[Allan McRae]

Use $srcdir and $pkgdir instead.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/makepkg.sh.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 89d40a7..92f31de 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1838,7 +1838,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
@@ -2975,14 +2975,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
 
@@ -2998,7 +2998,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"
-- 
1.8.4