--- trunk/mage/usr/lib/mage/mage4.sh	2005/10/03 13:48:06	254
+++ trunk/mage/usr/lib/mage/mage4.sh	2005/12/01 12:40:21	287
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Magellan Linux Installer (mage.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.8 2005-10-03 13:48:06 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.9 2005-12-01 12:40:21 niro Exp $
 
 # default die function
 die()
@@ -81,21 +81,22 @@
 	echo
 	echo "Usage: $(basename $0) [option] pkgname ..."
 	echo "Options:"
-	echo "     pretend        - pretends dependencies of a package"
-	echo "     srcpretend     - pretends dependencies of a package (build from source)"
-	echo "     install        - installs a package"
-	echo "     srcinstall     - installs a package from source"
-	echo "     uninstall      - removes a package"
-	echo "     update         - updates mage-tree"
-	echo "     uppretend      - pretend dependencies for a system upgrade"
-	echo "     upgrade        - runs a complete system upgrade"
-	echo "     srcuppretend   - pretend dependencies for a system upgrade from source"
-	echo "     srcupgrade     - runs a complete system upgrade from source"
-	echo "     search         - searches mage-tree for a package"
-	echo "     clean          - removes *all* downloaded packages"
-	echo "     unpack         - unpacks *all* needed package for 'foo'"
-	echo "     download       - downloads *all* needed packages for 'foo'"
-	echo "     version        - prints version info"
+	echo "    pretend         - pretends dependencies of a package"
+	echo "    srcpretend      - pretends dependencies of a package (build from source)"
+	echo "    install         - installs a package"
+	echo "    srcinstall      - installs a package from source"
+	echo "    uninstall       - removes a package"
+	echo "    update          - updates mage-tree"
+	echo "    uppretend       - pretend dependencies for a system upgrade"
+	echo "    upgrade         - runs a complete system upgrade"
+	echo "    srcuppretend    - pretend dependencies for a system upgrade from source"
+	echo "    srcupgrade      - runs a complete system upgrade from source"
+	echo "    search          - searches mage-tree for a package"
+	echo "    clean           - removes *all* downloaded packages"
+	echo "    unpack          - unpacks *all* needed package for 'foo'"
+	echo "    download        - downloads *all* needed packages for 'foo'"
+	echo "    version         - prints version info"
+	echo "    regen-mage-tree - regenerates the whole mage database (for devs only)"
 	echo
 	echo "Other options:"
 #	echo "NOINSTALL=yes $(basename $0) srcinstall PACKAGE"
@@ -138,6 +139,12 @@
 	[[ -z ${METHOD} ]] || [[ -z ${MAGENAME} ]] && print_usage && exit 1
 fi
 
+# set PKGDIR and BUILDDIR to MROOT
+if [[ -n ${MROOT} ]]
+then
+	PKGDIR=${MROOT}/${PKGDIR}
+	BUILDDIR=${MROOT}/${BUILDDIR}
+fi
 
 case ${METHOD} in
 	download)