--- branches/mage-next/src/mage.in	2014/03/04 15:31:43	2617
+++ branches/mage-next/src/mage.in	2014/03/04 15:33:19	2618
@@ -2,17 +2,15 @@
 # Magellan Linux Installer (mage.sh)
 # $Id$
 
-# include all needed files
-[ -f /etc/mage.rc.global ] &&  \
-	source /etc/mage.rc.global || \
-	die "/etc/mage.rc.global missing"
+# set default variables
+: ${MAGERC="@@SYSCONFDIR@@/mage.rc"}
+: ${MLIBDIR="@@MAGELIBDIR@@"}
 
-[ -f ${MAGERC} ] && source ${MAGERC} || \
-	die "Your ${MAGERC} is missing. Aborting."
-
-[ -f ${MLIBDIR}/mage4.functions.sh ] && \
-	source ${MLIBDIR}/mage4.functions.sh || \
-	die "mage functions missing"
+# first of all include common functions
+source ${MLIBDIR}/common.functions.sh
+source @@SYSCONFDIR@@/mage.rc.global
+source ${MAGERC}
+source ${MLIBDIR}/mage4.functions.sh
 
 # export default path
 export PATH="${PATH}:${MLIBDIR}"