From 1cfa7031581b25fc3199be1099b541e085793d2a Mon Sep 17 00:00:00 2001
From: Cyan Ogilvie <cyan@tirion.(none)>
Date: Tue, 29 Jan 2008 17:46:44 +0200
Subject: [PATCH] Tweaks for 8.5, teapot build

---
 Makefile                | 5 +++--
 scripts/baseconfig.itcl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d9634c2..179b406 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ install: all
 	install -d $(MYDESTDIR)
 	install -d $(MYDESTDIR)/scripts
 	install pkgIndex.tcl $(MYDESTDIR)
-	install tlc-base.tcl $(MYDESTDIR)
+	install init.tcl $(MYDESTDIR)
 	install scripts/*.tcl $(MYDESTDIR)/scripts
 	install scripts/*.itcl $(MYDESTDIR)/scripts
 	install scripts/tclIndex $(MYDESTDIR)/scripts
 
 teapot: all
+	install -d teapot
 	tclpe teapot.txt
 
 install-teapot:
@@ -35,4 +36,4 @@ test: all
 	$(TCLSH) tests/all.tcl $(TESTFLAGS)
 
 clean:
-	-rm -rf scripts/tclIndex scripts-stamp
+	-rm -rf scripts/tclIndex scripts-stamp teapot
diff --git a/scripts/baseconfig.itcl b/scripts/baseconfig.itcl
index 4a8b2bc..be1752b 100644
--- a/scripts/baseconfig.itcl
+++ b/scripts/baseconfig.itcl
@@ -100,7 +100,7 @@ body tlc::Baseconfig::constructor {args} { #<<<1
 	}
 
 	# for the configfile
-	if {[catch {eval configure $args} msg]} {
+	if {[catch {configure {*}$args} msg]} {
 		puts stderr "$msg\n"
 		show_options
 		puts stderr ""
@@ -122,7 +122,7 @@ body tlc::Baseconfig::constructor {args} { #<<<1
 	}
 
 	# allow the command line specified options to override the config file
-	eval configure $args
+	configure {*}$args
 }
 
 body tlc::Baseconfig::dump_config {} { #<<<1
-- 
2.11.4.GIT