--- ConcTcl.hs.~1~	Fri Feb 23 06:40:31 2001
+++ ConcTcl.hs	Mon Dec  1 08:26:47 2003
@@ -1,7 +1,8 @@
 module ConcTcl where
 import TclPrimImpl
 import Concurrent
+import ChannelVar
 import IOExts
 import IO
 import TclCompatibility
--- Makefile.~1~	Wed Oct  3 07:58:55 2001
+++ Makefile	Mon Dec  1 08:53:14 2003
@@ -36,7 +36,7 @@
 #
 #######################################################################
 
-CC = gcc
+CC = $(GHC)
 CC_OPTS = -O
 CC_INC = -I/usr/X11/include -I/usr/local/include
 
@@ -72,7 +72,7 @@
 HIS = *.hi
 
 GHC_OPTS = -O -fglasgow-exts -recomp -dcore-lint -fvia-C \
-           -package concurrent -package-name TclHaskell
+           -package concurrent -package lang -package-name TclHaskell
 
 GHC_INC =
 
@@ -106,10 +106,18 @@
 pkg : 
 	ghc-pkg -a < tclhaskell.conf
 
+# Keep it simple and use package in-situ.
+impdir=$(shell cygpath -w `pwd` | sed -e 's%\\%/%g')
+libdir=$(shell cygpath -w `pwd` | sed -e 's%\\%/%g') 
+TCLVERSION=84
+GHC_PKG=ghc-pkg
+
+pkg.w32:
+	impdir=$(impdir) libdir=$(libdir) TCLLIB=tcl$(TCLVERSION) TKLIB=tk$(TCLVERSION) $(GHC_PKG) -u < tclhaskell.conf.win32
+
 unpkg:
 	ghc-pkg -r TclHaskell
-
 
 tclprim : TclPrimImpl.o tclhaskell.o
 
--- TclPrimGhc.hs.~1~	Fri Feb 23 04:23:23 2001
+++ TclPrimGhc.hs	Mon Dec  1 08:22:59 2003
@@ -42,8 +42,8 @@
  writeElt pstr 0 str
  return pstr
   where
-   len = Word.intToWord32 (length str + 1)
+   len = fromIntegral (length str + 1)
 
    writeElt addr n [] = writeCharOffAddr addr n '\0'
    writeElt addr n (v :vs) = do
--- tclhaskell.c.~1~	Thu Sep 27 06:54:30 2001
+++ tclhaskell.c	Mon Dec  1 08:47:40 2003
@@ -220,7 +220,8 @@
 
     init_queue();          /* Reset commuication buffers */
 
+    Tcl_FindExecutable(NULL);
     interp = Tcl_CreateInterp();
 
     Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);