Index: tools/toolchain.sh
===================================================================
--- tools/toolchain.sh	(revision b08941d1678cbbd629779b42bcfc4b47c1a39134)
+++ tools/toolchain.sh	(revision 591b989e1751b3ac580286c9c1bc10a9650d1fb9)
@@ -73,5 +73,4 @@
 REAL_INSTALL=true
 USE_HELENOS_TARGET=false
-INSTALL_DIR="${BASEDIR}/PKG"
 
 #
@@ -420,5 +419,6 @@
 	fi
 	
-	WORKDIR="${BASEDIR}/${PLATFORM}"
+	WORKDIR="${BASEDIR}/${TARGET}"
+	INSTALL_DIR="${WORKDIR}/PKG"
 	BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
 	GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
@@ -429,13 +429,6 @@
 		CROSS_PREFIX="/usr/local/cross"
 	fi
-	if [ -z "${CROSS_HELENOS_PREFIX}" ] ; then
-		CROSS_HELENOS_PREFIX="/usr/local/cross-helenos"
-	fi
-	
-	if $USE_HELENOS_TARGET ; then
-		PREFIX="${CROSS_HELENOS_PREFIX}/${PLATFORM}"
-	else
-		PREFIX="${CROSS_PREFIX}/${PLATFORM}"
-	fi
+	
+	PREFIX="${CROSS_PREFIX}/${TARGET}"
 	
 	echo ">>> Downloading tarballs"