diff --git a/scripts/get-env.sh b/scripts/get-env.sh
index 968ba290..6edfc15f 100755
--- a/scripts/get-env.sh
+++ b/scripts/get-env.sh
@@ -83,7 +83,7 @@ fi
 echo "        Xilinx directory is: $XILINX_DIR/opt/Xilinx/"
 
 # gcc+binutils for the target
-CONDA_DIR=$SETUP_DIR/build/conda
+CONDA_DIR=$BUILD_DIR/conda
 export PATH=$CONDA_DIR/bin:$PATH
 (
 	if [ ! -d $CONDA_DIR ]; then
diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh
index 9d6e98ad..4ed14082 100755
--- a/scripts/setup-env.sh
+++ b/scripts/setup-env.sh
@@ -49,7 +49,7 @@ echo "        Xilinx directory is: $XILINX_DIR/opt/Xilinx/"
 export PATH=$PATH:$XILINX_DIR/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64
 
 # gcc+binutils for the target
-CONDA_DIR=$SETUP_DIR/build/conda
+CONDA_DIR=$BUILD_DIR/conda
 export PATH=$CONDA_DIR/bin:$PATH
 
 # migen