--- trunk/mage/usr/lib/mage/smage2.sh	2005/07/31 11:57:05	169
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/08/16 23:23:33	186
@@ -4,14 +4,13 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.16 2005-07-31 11:57:05 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.21 2005-08-16 23:23:26 niro Exp $
 
 #01.10.2004
 #	added ccache support
 #	added distcc support
 
 ## setup ##
-SMAGEVERSION=0.3.6-r19
 PKGSUFFIX="mpk"
 SMAGENAME="$1"
 SMAGESUFFIX="smage2"
@@ -19,6 +18,7 @@
 #SMAGESCRIPTSDIR="/bootstrap/smage2-install-scripts"
 #SMAGE2RSYNC="rsync://192.168.0.2/smage2-scripts"
 MLIBDIR=/usr/lib/mage
+SMAGEVERSION="$( < ${MLIBDIR}/version)"
 
 # export default C locale
 export LC_ALL=C
@@ -357,6 +357,20 @@
 	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 }
 
+sminclude() {
+	local i
+
+	if [[ -n "$@" ]]
+	then
+		for i in $@
+		do
+			echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
+			source ${SMAGESCRIPTSDIR}/include/${i}.sminc
+		done
+		echo
+	fi
+}
+
 setup_distcc_environment(){
 	if [ -x /usr/bin/distcc ]
 	then
@@ -492,7 +506,6 @@
 #download sources
 if [ "$1" == "download" -a -n "$2" ]
 then
-	showversion
 	if [ ! -d ${SMAGESCRIPTSDIR} ]
 	then
 		install -d ${SMAGESCRIPTSDIR}