Index: tol/bin/confenv.sh
===================================================================
--- tol/bin/confenv.sh	(revision da2804ff140276f3398dac11c42cdccb6d82cc86)
+++ tol/bin/confenv.sh	(revision 22dc70e4a13b8a6941bac56f2852fa845d8a15a0)
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 # create tolenv.sh
 #
@@ -37,12 +37,10 @@
 if  command R RHOME >/dev/null 2>/dev/null ; then
   echo "R can be invoked"
+  R_HOME_DIR=$(R RHOME)
+  Rcpp_INSTALLED=$(check_installed Rcpp)
+  Rinside_INSTALLED=$(check_installed RInside)
 else
   echo "R cannot be invoked"
-  exit
 fi
-
-R_HOME_DIR=$(R RHOME)
-Rcpp_INSTALLED=$(check_installed Rcpp)
-Rinside_INSTALLED=$(check_installed RInside)
 
 if [ $Rcpp_INSTALLED -eq 1 ] ; then
@@ -67,7 +65,12 @@
 # environment needed for tol processes
 #
-LD_LIBRARY_PATH=$_LD_PATH:\$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$_LD_PATH:\$LD_LIBRARY_PATH
+export TCLLIBPATH=$TOL_PREFIX/lib
+export TOL_LIBRARY=$TOL_PREFIX/bin/stdlib
+EOF
+
+if [ x"$R_HOME_DIR" != x ]; then
+cat << EOF >> $TOLENV
 export R_HOME=$R_HOME_DIR
 EOF
-
+fi
Index: tol/bin/tolcon.sh
===================================================================
--- tol/bin/tolcon.sh	(revision da2804ff140276f3398dac11c42cdccb6d82cc86)
+++ tol/bin/tolcon.sh	(revision 22dc70e4a13b8a6941bac56f2852fa845d8a15a0)
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 # Shell wrapper for TOL executable.
 
