[pacman-dev] CVS update of pacman-lib/scripts (makepkg)

[dan at archlinux.org]

    Date: Saturday, February 3, 2007 @ 00:21:55
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.40 -> 1.41)

Fix problem with PKGDEST variable not being used correctly.


---------+
 makepkg |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.40 pacman-lib/scripts/makepkg:1.41
--- pacman-lib/scripts/makepkg:1.40	Wed Jan 31 21:34:03 2007
+++ pacman-lib/scripts/makepkg	Sat Feb  3 00:21:55 2007
@@ -314,9 +314,8 @@
 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 @@
 
 # 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