From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 3 Dec 2001 19:23:07 +0000 (+0000)
Subject: Fixed IRCLIENT_SHELL setting.
X-Git-Tag: IRTCL.1.4
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=59e46e96c64563d6fe80140f9961d9308dd95a21;p=ir-tcl-moved-to-github.git

Fixed IRCLIENT_SHELL setting.
---

diff --git a/Makefile.in b/Makefile.in
index 5b57763..836d29e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # IR toolkit for tcl/tk
 # (c) Index Data 1995-1999
 # See the file LICENSE for details.
-# $Id: Makefile.in,v 1.56 2001-12-03 18:52:06 adam Exp $
+# $Id: Makefile.in,v 1.57 2001-12-03 19:23:07 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
@@ -109,7 +109,7 @@ install: @ALL_SPEC@
 	@if [ -f ir-tk ]; then \
 		$(INSTALL_PROGRAM) ir-tk $(BUILD)$(BINDIR); \
 	fi
-	@echo "#! $(BINDIR)/@IRCLIENT_SHELL@ -f" >head.bak; \
+	@echo "#! @IRCLIENT_SHELL@ -f" >head.bak; \
 	cat head.bak client.tcl| sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," >client.bak; \
 	$(INSTALL_PROGRAM) client.bak $(BUILD)$(BINDIR)/irclient; \
 	if [ -f $(BUILD)$(IRTCLDIR)/irtdb.tcl ]; then \
diff --git a/configure.in b/configure.in
index ace3902..3b03503 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1996-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.32 2001-12-03 18:52:06 adam Exp $
+dnl $Id: configure.in,v 1.33 2001-12-03 19:23:07 adam Exp $
 AC_INIT(ir-tcl.h)
 dnl ------ Substitutions
 AC_SUBST(CC)
@@ -53,7 +53,10 @@ if test "x$tclconfig" = xNONE; then
 		prefix=/usr/local
 	fi
         tclconfig=${prefix}/lib
+        IRCLIENT_SHELL=${prefix}/bin/wish
         prefix=${saveprefix}
+else
+        IRCLIENT_SHELL=/usr/bin/wish
 fi
 AC_MSG_CHECKING(for Tcl)
 if test -f ${tclconfig}/tclConfig.sh; then