Fix problem with PKGDEST variable not being used correctly.

1 files changed, 3 insertions, 2 deletions

diff --git a/scripts/makepkg b/scripts/makepkg
index 4f021876..ec1b2267 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -314,9 +314,8 @@ usage() {
 ARGLIST=$@
 
 #preserve environment variables
-PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
 _PKGDEST=${PKGDEST}
-_SRCDEST=$SRCDEST
+_SRCDEST=${SRCDEST}
 
 #Source makepkg.conf; fail if it is not found
 if [ -f /etc/makepkg.conf ]; then
@@ -333,7 +332,9 @@ fi
 
 # override settings with an environment variable for batch processing
 PKGDEST=${_PKGDEST:-$PKGDEST}
+PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
 SRCDEST=${_SRCDEST:-$SRCDEST}
+SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined
 
 while [ "$#" -ne "0" ]; do
 	case $1 in