--- trunk/bootstrap/scripts/mage-bootstrap.sh	2007/01/22 21:46:31	422
+++ trunk/bootstrap/scripts/mage-bootstrap.sh	2008/03/20 11:55:44	683
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/bootstrap/scripts/mage-bootstrap.sh,v 1.6 2007-01-22 21:46:31 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/bootstrap/scripts/mage-bootstrap.sh,v 1.7 2008-03-20 11:55:44 niro Exp $
 
 TOOLCHAIN=""
 BASESYSTEM=""
@@ -55,6 +55,8 @@
 	local SMAGE2RSYNC
 
 	# sanity checks
+	[ -f /etc/mage.rc.global ] && source /etc/mage.rc.global || \
+		die "get_value_from_magefile: /etc/mage.rc.global not found."
 	[ -f ${magerc} ] && source ${magerc} || \
 		die "get_value_from_magefile: ${magerc} not found."
 	[ -z "${var}" ] && die "get_value_from_magefile: \$var not given."
@@ -194,8 +196,8 @@
 
 # this way toolchain and basesystem can be packages;
 # only if nothing set the layout files from the profile will be taken
-[ -z "${TOOLCHAIN}" ] && TOOLCHAIN="$(< /etc/mage-profile/toolchain.defaults)"
-[ -z "${BASESYSTEM}" ] && BASESYSTEM="$(< /etc/mage-profile/basesystem.defaults)"
+[ -z "${TOOLCHAIN}" ] && TOOLCHAIN="$(< ${MY_MAGEDIR}/profiles/${PROFILE}/toolchain.defaults)"
+[ -z "${BASESYSTEM}" ] && BASESYSTEM="$(< ${MY_MAGEDIR}/profiles/${PROFILE}/basesystem.defaults)"
 
 # install toolchain
 CONFIG_PROTECT="-*" MROOT="${MROOT}" MAGERC="${MAGERC}" mage install ${TOOLCHAIN} || die "toolchain install"