[pacman-dev] [PATCH] makepkg: make SRCPKGDEST default to $startdir

[Cedric Staniewski]

The current behaviour, which is placing source packages in PKGDEST if
SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and
there is no real advantage in doing so.
---
 doc/makepkg.conf.5.txt |    4 ++--
 scripts/makepkg.sh.in  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 020804c..6130249 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -183,8 +183,8 @@ Options
 
 **SRCPKGDEST=**"/path/to/folder"::
 	If this value is not set, source package files will be stored in
-	PKGDEST. Many people like to keep all source package files in
-	a central location for easy cleanup, so this path can be set here.
+	in the current directory. Many people like to keep all source package files
+	in a central location for easy cleanup, so this path can be set here.
 
 **PACKAGER=**"John Doe <john at example.com>"::
 	This value is used when querying a package to see who was the builder.
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 0a90b89..493c962 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1744,7 +1744,7 @@ if [[ ! -w $SRCDEST ]] ; then
 fi
 
 SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST}
-SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined
+SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
 
 
 if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then
-- 
1.7.4