X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8aeab9159a46eec9e55642a406c8a0641eace7d9;hp=401b7e4746b0f7cb0d90695371db529311cb46e3;hb=2b35fdfa5fd016e7a0c99b0cd0958c9ce8606ef9;hpb=7efed25c2ed807d32001e749f87f2eb300548c22

diff --git a/win/makefile b/win/makefile
index 401b7e4..8aeab91 100644
--- a/win/makefile
+++ b/win/makefile
@@ -7,8 +7,8 @@ DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 1
 
 # TCL
-TCL="C:\Tcl\bin\tclsh85.exe"
-#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
 HAVE_TCL=1
 
 # iconv charcter conversion utility
@@ -498,6 +498,7 @@ MISC_OBJS= \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
    $(OBJDIR)\zoom-event.obj \
+   $(OBJDIR)\zoom-memcached.obj \
    $(OBJDIR)\zoom-record-cache.obj \
    $(OBJDIR)\zoom-z3950.obj \
    $(OBJDIR)\zoom-sru.obj \
@@ -508,6 +509,7 @@ MISC_OBJS= \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
    $(OBJDIR)\init_diag.obj \
+   $(OBJDIR)\init_globals.obj \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
@@ -877,7 +879,7 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
 !if $(HAVE_BISON)
 $(SRCDIR)\cql.c: $(SRCDIR)\cql.y
 	@cd $(SRCDIR)
-	$(BISON) -y -o cql.c cql.y
+	$(BISON) -y -p cql_ -o cql.c cql.y
 
 !endif