From fb0f8f3d4378cf283b9662877197ecc102a6f55e Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Wed, 9 Feb 2011 09:03:13 +0000
Subject: [PATCH] Use subdirectories under work for each package.

---
 install_toolchain.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/install_toolchain.sh b/install_toolchain.sh
index 40270a6..ec5130b 100755
--- a/install_toolchain.sh
+++ b/install_toolchain.sh
@@ -11,14 +11,14 @@ export SIT_DIR=$(dirname "$ORIGDIR/$0")
 echo $SIT_DIR
 
 export SRC_POOL=${HOME}/src
-export WORKDIR=${HOME}/work
+export WORKDIR_BASE=${HOME}/work
 
 PREFIX=$HOME/bin/local
 MAKEOPTS="-j4"
 
 
 
-module load compiler/gnu/4.5
+module load compiler/gnu/4.4.3
 
 M4_VERSION=1.4.15
 BISON_VERSION=2.4.2
@@ -67,6 +67,9 @@ function sit_install() {
 }
 
 function sit_auto_install() {
+	export WORKDIR=$WORKDIR_BASE/${P}
+	export SRCDIR=${WORKDIR}/${P}
+	export BUILDDIR=${WORKDIR}/build
 	if [ -d ${WORKDIR} ]
 	then
 		rm -rf ${WORKDIR}
@@ -84,37 +87,27 @@ function sit_auto_install() {
 # install m4
 P=m4-${M4_VERSION}
 A=${P}.tar.bz2
-export SRCDIR=${WORKDIR}/${P}
-export BUILDDIR=${WORKDIR}/build
 sit_auto_install
 
 
 # install bison
 P=bison-${BISON_VERSION}
 A=${P}.tar.bz2
-export SRCDIR=${WORKDIR}/${P}
-export BUILDDIR=${WORKDIR}/build
 sit_auto_install
 
 # install libtool
 P=libtool-${LIBTOOL_VERSION}
 A=${P}.tar.gz
-export SRCDIR=${WORKDIR}/${P}
-export BUILDDIR=${WORKDIR}/build
 sit_auto_install
 
 # install autoconf 
 P=autoconf-${AUTOCONF_VERSION}
 A=${P}.tar.gz
-export SRCDIR=${WORKDIR}/${P}
-export BUILDDIR=${WORKDIR}/build
 sit_auto_install
 
 # install automake
 P=automake-${AUTOMAKE_VERSION}
 A=${P}.tar.bz2
-export SRCDIR=${WORKDIR}/${P}
-export BUILDDIR=${WORKDIR}/build
 sit_auto_install
 
 exit 0