2009-02-24 Joel Sherrill <joel.sherrill@oarcorp.com>

	* gcc/rundeja, gcc/test_driver: Use INSTALL and BSP_INSTALL more
	consistently.

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e028a72..3d405b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-02-24	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* gcc/rundeja, gcc/test_driver: Use INSTALL and BSP_INSTALL more
+	consistently.
+
+2009-02-24	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* gcc/do_one: If not running tests, do not confirm BSP has a DejaGNU
 	configuration.
 
diff --git a/gcc/rundeja b/gcc/rundeja
index aa85126..44ead12 100755
--- a/gcc/rundeja
+++ b/gcc/rundeja
@@ -82,7 +82,7 @@ case $1 in
     ;;
 esac
 
-rtemsdir=${BASEDIR}/bsp-install/${CPU}-rtems${RTEMS_VERSION}/${BSP}
+rtemsdir=${BSP_INSTALL}/${CPU}-rtems${RTEMS_VERSION}/${BSP}
 
 dfile=~/.dejagnurc
 if [ -r ${dfile} ] ; then
diff --git a/gcc/test_driver b/gcc/test_driver
index a94bd39..88108fc 100755
--- a/gcc/test_driver
+++ b/gcc/test_driver
@@ -61,8 +61,8 @@ update_gcc()
 # HELPER - Remove all the installed previous builds
 clean_up()
 {
-  rm -rf install/* &
-  rm -rf bsp-install/* &
+  rm -rf ${INSTALL}/* &
+  rm -rf ${BSP_INSTALL}/* &
   wait
 }
 
@@ -72,7 +72,7 @@ install_auto()
   do
     cd ${auto}
     make distclean
-    ./configure --prefix=${BASEDIR}/install
+    ./configure --prefix=${INSTALL}
     make all install
   done
 }