From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 18 Aug 2005 18:42:37 +0000 (+0000)
Subject: Updated to use libxml 2.6.20, zlib 1.2.3
X-Git-Tag: YAZXF2.1.4.2.2.release~5
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=637213cb79d34110cb367369ece0745cdc2b554f

Updated to use libxml 2.6.20, zlib 1.2.3
---

diff --git a/win/makefile b/win/makefile
index d69f4fe..c1ecf41 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.94 2005-04-22 14:51:11 adam Exp $
+# $Id: makefile,v 1.95 2005-08-18 18:42:37 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -22,10 +22,10 @@ ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.19.win32
+LIBXML2_DIR=c:\libxml2-2.6.20.win32
 
 # zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.2.win32
+ZLIB_DIR = c:\zlib-1.2.3.win32
 
 # get WIN32 binaries libxml2 & iconv & zlib from here:
 #  http://www.zlatkovic.com/libxml.en.html
@@ -134,7 +134,7 @@ ICONV_LIB= \
 iconv: $(BINDIR)\iconv.dll
 
 $(BINDIR)\iconv.dll:
-  copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
+  copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
 !else
 ICONV_DEF= \
   /D HAVE_ICONV_H=0