aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2010-11-03 20:52:27 +1000
committerSteve Bennett <steveb@workware.net.au>2010-11-08 15:26:22 +1000
commitb7a3951c0046491a62399fc51fe809e24e5eb8b7 (patch)
treef8e446671295666b44a8709cf18f13a5a64ca14b /configure
parentcba565f4ccd4a667cc3b51108fae55cc735b36aa (diff)
downloadjimtcl-b7a3951c0046491a62399fc51fe809e24e5eb8b7.zip
jimtcl-b7a3951c0046491a62399fc51fe809e24e5eb8b7.tar.gz
jimtcl-b7a3951c0046491a62399fc51fe809e24e5eb8b7.tar.bz2
Don't hardcode /lib/jim
Instead, set TCL_LIBRARY based on where jim is installed. This defaults to /usr/local (thus /usr/local/lib/jim), or can be modified with either configure or make. e.g. ./configure --prefix=/usr or make prefix=/usr install Now auto_path is initialised only to TCL_LIBRARY, and doesn't include "." which could be undesirable. At the same time, simplify jimsh initialisation using a script instead of C code. Add the path to the executable to auto_path. Also, no longer use JIM_TCL_COMPAT. Always use the tcl-compatible names, $auto_path and $tcl_interactive. Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 4e8d758..4335968 100755
--- a/configure
+++ b/configure
@@ -606,6 +606,7 @@ LIBOBJS
PLATFORM_PLATFORM
PLATFORM_OS
SRCDIR
+TCL_LIBRARY
EXTRA_OBJS
EXTRA_CFLAGS
JIM_TCL_EXTENSIONS
@@ -4246,6 +4247,8 @@ EXTRA_CFLAGS=$EXTRA_CFLAGS
EXTRA_OBJS=$EXTRA_OBJS
+TCL_LIBRARY=$libdir/jim
+
SRCDIR=`dirname $0`
PLATFORM_OS=`uname -s`