From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 13 Nov 2013 12:37:30 +0000 (+0100)
Subject: Update WIN makefile for YAZ 5.
X-Git-Tag: v1.6.37~3^2
X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=commitdiff_plain;h=a0bb88120d5fc86e5e106fe3309a344c08a96f20

Update WIN makefile for YAZ 5.
---

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index a66b18e..e1ed332 100644
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -3,7 +3,6 @@
   
   <server>
     <listen port="9004"/>
-    <proxy host="localhost:80"/>
     <include src="default.xml"/>
   </server>
   
diff --git a/win/makefile b/win/makefile
index 0b1b92c..99e88d2 100644
--- a/win/makefile
+++ b/win/makefile
@@ -59,19 +59,19 @@ pazpar2: $(PAZPAR2_EXE)
 
 YAZBINDIR=$(YAZ_DIR)\bin
 !if $(DEBUG)
-YAZ_LIB="$(YAZ_DIR)\lib\yaz4d.lib" "$(YAZ_DIR)\lib\yaz_cond4d.lib" 
+YAZ_LIB="$(YAZ_DIR)\lib\yaz5d.lib" "$(YAZ_DIR)\lib\yaz_cond5d.lib" 
 !if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5d.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll"
 !else
-YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\yaz5.lib" "$(YAZ_DIR)\lib\yaz_cond5.lib"
 !if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz4.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5.dll"
 !endif
 
 YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"