--- trunk/mage/usr/lib/mage/smage2.sh	2006/12/29 23:37:07	405
+++ trunk/mage/usr/lib/mage/smage2.sh	2006/12/29 23:37:56	406
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.45 2006-12-29 22:42:22 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.46 2006-12-29 23:37:56 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -533,7 +533,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.45 2006-12-29 22:42:22 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.46 2006-12-29 23:37:56 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -769,10 +769,12 @@
 		return 0
 	fi
 
+	[ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."
+
 	echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
 	( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
-	[[ ! -d ${PKGDIR}/sources ]] && install -d ${PKGDIR}/sources
-	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PKGDIR}/sources/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
+	[[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
+	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
 
 	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
 }
@@ -930,11 +932,11 @@
 	exit 0
 fi
 
-if [ "$1" == "--src-tarball" -a -n "$2" -a -n "$3" ]
+if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
 then
 	# set correct SMAGENAME
-	SMAGENAME="$3"
-	SRCPKGTARBALL="$2"
+	SMAGENAME="$2"
+	SRCPKGTARBALL="${SRCPKGDIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).${SRCPKGSUFFIX}"
 	USE_SRC_PKG_TARBALL=true
 
 	echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"