Index: toltcl/CMakeLists.txt
===================================================================
--- toltcl/CMakeLists.txt	(revision 43da12edbd52771483e43cd838a81b279c06e55e)
+++ toltcl/CMakeLists.txt	(revision 3cc480d8fca22ac69521ac69ce6ebdbd76b91dc3)
@@ -1,4 +1,6 @@
 cmake_minimum_required( VERSION 2.8 )
 project( TOLTCL )
+
+set( INSTALL_WITH_TOL 1 )
 
 set( CMAKE_MODULE_PATH
@@ -55,5 +57,9 @@
   message( STATUS ${TCL_INCLUDE_PATH} )
   message( STATUS ${TCL_LIBRARY_PATH} )
-  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  if( ${INSTALL_WITH_TOL} )
+    set( CMAKE_INSTALL_PREFIX ${TOL_PREFIX_PATH} )
+  else( ${INSTALL_WITH_TOL} )
+    get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  endif( )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )
Index: toltcl/generic/tolsh.c
===================================================================
--- toltcl/generic/tolsh.c	(revision 43da12edbd52771483e43cd838a81b279c06e55e)
+++ toltcl/generic/tolsh.c	(revision 3cc480d8fca22ac69521ac69ce6ebdbd76b91dc3)
@@ -30,5 +30,12 @@
     }
   SetupArgv( interp );
-  Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1);
+  Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
+               " [file dir [file dir ", Tcl_GetNameOfExecutable(),
+               " ] ] lib ]", NULL );
+  if ( !Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1) )
+    {
+    printf( "%s\n", Tcl_GetStringResult( interp ) );
+    Tcl_Exit( -1 );
+    }
   return TCL_OK;
 }