Index: xotcl/configure.in
===================================================================
diff -u -rcbbcdfc2c1fcbf6d16a0fe9a1f3f8408ae0cbdee -r9722a51911e1502444c173306c8c88f7f3888989
--- xotcl/configure.in	(.../configure.in)	(revision cbbcdfc2c1fcbf6d16a0fe9a1f3f8408ae0cbdee)
+++ xotcl/configure.in	(.../configure.in)	(revision 9722a51911e1502444c173306c8c88f7f3888989)
@@ -18,7 +18,7 @@
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
 # This will define a ${TEA_PLATFORM} variable == "unix" or "windows".
 #--------------------------------------------------------------------
-                                                                                
+
 TEA_INIT([3.0])
 AC_CONFIG_AUX_DIR(config)
 
@@ -323,23 +323,43 @@
 
 TEA_PROG_TCLSH
 
+# make this available, for such as xotclConfig.sh
+XOTCL_COMPATIBLE_TCLSH=${TCLSH_PROG}
+AC_SUBST(XOTCL_COMPATIBLE_TCLSH)
+
+# resolve the variables
+eval "libdir=${libdir}"
+eval "datadir=${datadir}"
+eval "includedir=${includedir}"
+
+PKG_DIR="${PACKAGE_NAME}${PACKAGE_VERSION}"
+pkgdatadir="${datadir}/${PKG_DIR}"
+pkglibdir="${libdir}/${PKG_DIR}"
+pkgincludedir="${includedir}/${PKG_DIR}"
+
+AC_SUBST(PKG_DIR)
+AC_SUBST(pkgdatadir)
+AC_SUBST(pkglibdir)
+AC_SUBST(pkgincludedir)
+
 #
 # XOTcl specific configs
 #
+
 XOTCL_BUILD_LIB_SPEC="-L`pwd` -lxotcl${PACKAGE_VERSION}"
-XOTCL_LIB_SPEC="-L${exec_prefix}/lib -lxotcl${PACKAGE_VERSION}"
+XOTCL_LIB_SPEC="-L${pkglibdir} -lxotcl${PACKAGE_VERSION}"
 
 # stub libs are not build for 8.0
 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then
-	XOTCL_BUILD_STUB_LIB_SPEC=""
-	XOTCL_STUB_LIB_SPEC=""
 	XOTCL_BUILD_STUB_LIB_PATH=""
 	XOTCL_STUB_LIB_PATH=""
+	XOTCL_BUILD_STUB_LIB_SPEC=""
+	XOTCL_STUB_LIB_SPEC=""
 else
-	XOTCL_BUILD_STUB_LIB_SPEC="-L`pwd` -lxotclstub${PACKAGE_VERSION}"
-	XOTCL_STUB_LIB_SPEC="-L${exec_prefix}/lib -lxotclstub${PACKAGE_VERSION}"
 	XOTCL_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-	XOTCL_STUB_LIB_PATH="${exec_prefix}/lib/${PKG_STUB_LIB_FILE}"
+	XOTCL_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+	XOTCL_BUILD_STUB_LIB_SPEC="-L`pwd` -lxotclstub${PACKAGE_VERSION}"
+	XOTCL_STUB_LIB_SPEC="-L${pkglibdir} -lxotclstub${PACKAGE_VERSION}"
 	AC_DEFINE(COMPILE_XOTCL_STUBS)
 fi