--- a/build-g11n-spec.sh	Sun Dec 19 15:32:03 2010 +0900
+++ b/build-g11n-spec.sh	Wed Jan 05 09:36:53 2011 +0100
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 # Build IM pkgs
-cmdname=$(basename $0)
-
-usage="$cmdname [-d <topdir>] [-p] [-b] [-n] [spec files...]"
+usage="$(basename $0) [-d <topdir>] [-p] [-b] [-n] [spec files...]"
 usage="$usage\nDefault build type is 'build-only'"
 usage="$usage\n    -d <topdir>: specify another top dir."
 usage="$usage\n    -p         : source prep only."
@@ -20,11 +18,15 @@
 
 IPS_VENDORVER=0.${L10N_BUILDNUM:-"155"}
 PUBLISHER=${L10N_PUBLISHER:-"l10n-nightly"}
-GLOBAL_PKGDEST=${PKGDEST}
 
-export PATH=/usr/bin:/usr/sbin
+rm -f /tmp/.build_env.$$
+[ -z "$PKGDEST" ] 	|| echo "export PKGDEST=$PKGDEST" >> /tmp/.build_env.$$
+[ -z "$IPS_VENDORVER" ]	|| echo "export IPS_VENDORVER=$IPS_VENDORVER" >> /tmp/.build_env.$$
+[ -z "$PUBLISHER" ] 	|| echo "export PUBLISHER=$PUBLISHER" >> /tmp/.build_env.$$
+
 source /opt/jdsbld/bin/env.sh
-export PYTHON=/usr/bin/python2.6
+
+. /tmp/.build_env.$$
 
 while getopts pad:n option
 do
@@ -54,6 +56,12 @@
 # export http_proxy=
 # export ftp_proxy=
 
+if [ -z $1 ]; then
+    SPECFILES="cmdassist.spec icu.spec idnkit.spec"
+else
+    SPECFILES=$@
+fi
+
 if [ X$FLAGPREP = 'X1' ]; then
     CMD='prep'
 elif [ X$FLAGALL = 'X1' ]; then
@@ -62,20 +70,14 @@
     CMD='build-only'
 fi
 
-if [ -z $1 ]; then
-    SPECFILES="cmdassist.spec icu.spec idnkit.spec"
-else
-    SPECFILES=$@
-fi
-
 # Explicitly specifying location to enable to use pkgtool (pkgbuild)
 # not yet in jdsbld.
 PKGTOOL="/opt/pkgbuild/bin/pkgtool"
 
 # IPS repos are created in $PKGDEST if defined in environment,
 # otherwise in $BLDDIR (build.$MACH).
-IPS_REPODIR="${GLOBAL_PKGDEST:-$BLDDIR}/repo.spec"
-SRC_IPS_REPODIR="${GLOBAL_PKGDEST:-$BLDDIR}/repoS.spec"
+IPS_REPODIR="${PKGDEST:-$BLDDIR}/repo.spec"
+SRC_IPS_REPODIR="${PKGDEST:-$BLDDIR}/repoS.spec"
 
 export PKGBUILD_IPS_SERVER="file://$IPS_REPODIR/"
 export PKGBUILD_SRC_IPS_SERVER="file://$SRC_IPS_REPODIR/"