Index: xotcl/xotclConfig.sh
===================================================================
diff -u -r99a7a21854051cd691029b15ef8877aa9e86cf44 -r7eebad4e9179bac6fac6af582851da851ff8def6
--- xotcl/xotclConfig.sh	(.../xotclConfig.sh)	(revision 99a7a21854051cd691029b15ef8877aa9e86cf44)
+++ xotcl/xotclConfig.sh	(.../xotclConfig.sh)	(revision 7eebad4e9179bac6fac6af582851da851ff8def6)
@@ -24,7 +24,7 @@
 
 # String to pass to compiles to pick up the XOTcl includes from their
 # installed directory.
-XOTCL_INCLUDE_DIR="/usr/local/aolserver45/include/xotcl1.5.4"
+XOTCL_INCLUDE_DIR="/usr/local/include/xotcl1.5.4"
 XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR"
 
 # The name of the XOTcl library (may be either a .a file or a shared library):
@@ -36,7 +36,7 @@
 
 # String to pass to linker to pick up the XOTcl library from its
 # installed directory.
-XOTCL_LIB_SPEC='-L/usr/local/aolserver45/lib/xotcl1.5.4 -lxotcl1.5.4'
+XOTCL_LIB_SPEC='-L/usr/local/lib/xotcl1.5.4 -lxotcl1.5.4'
 
 # The name of the XOTcl stub library (a .a file):
 # XOTCL_STUB_LIB_FILE=libxotclstub1.5.4.a
@@ -47,11 +47,11 @@
 
 # String to pass to linker to pick up the XOTcl stub library from its
 # installed directory.
-XOTCL_STUB_LIB_SPEC='-L/usr/local/aolserver45/lib/xotcl1.5.4 -lxotclstub1.5.4'
+XOTCL_STUB_LIB_SPEC='-L/usr/local/lib/xotcl1.5.4 -lxotclstub1.5.4'
 
 # Name of the xotcl stub library with full path in build and install directory
 XOTCL_BUILD_STUB_LIB_PATH='/Users/neumann/src/xotcl-1.5.4/libxotclstub1.5.4.a'
-XOTCL_STUB_LIB_PATH='/usr/local/aolserver45/lib/xotcl1.5.4/libxotclstub1.5.4.a'
+XOTCL_STUB_LIB_PATH='/usr/local/lib/xotcl1.5.4/libxotclstub1.5.4.a'
 
 # Location of the top-level source directories from which XOTcl
 # was built.  This is the directory that contains generic, unix, etc.
@@ -65,5 +65,5 @@
 XOTCL_UNSHARED_LIB_SUFFIX=1.5.4.a
 
 # the shell in whose installation dirs the xotcl package is installed
-XOTCL_COMPATIBLE_TCLSH=/usr/local/aolserver45/bin/tclsh8.4
+XOTCL_COMPATIBLE_TCLSH=/usr/local/bin/tclsh8.5