X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=cae6a842024f54eac201b7833f2912778c67e8bb;hb=21f7c16c6b1b694405dbc1760d3d6cb3caac38f6;hp=f09af9b15cf23da068890192139eab5ead7207fc;hpb=783d4b3820a54d9079499a4b09ad4b98b709dbde;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index f09af9b..cae6a84 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.107 2006-05-07 17:43:42 adam Exp $
+# $Id: makefile,v 1.111 2006-06-07 14:25:43 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -48,7 +48,6 @@ HHC="c:\program files\html help workshop\hhc.exe"
 dist: 
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
-	nmake DEBUG=1
 	nmake DEBUG=0
 	$(NSIS) yaz.nsi
 
@@ -180,7 +179,10 @@ libxml2:
 
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
-LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
+LIBXSLT_DEF= \
+	/D HAVE_XSLTSAVERESULTTOSTRING=1 \
+	/D HAVE_XSLT=1 \
+	/I"$(LIBXSLT_DIR)\include"
 libxslt: $(BINDIR)\libxslt.dll
 
 $(BINDIR)\libxslt.dll:
@@ -203,6 +205,7 @@ COMMON_C_OPTIONS=          \
   $(LIBXML2_DEF)           \
   $(LIBXSLT_DEF)           \
   /D "_CRT_SECURE_NO_DEPRECATE" \
+  /D "_CRT_NONSTDC_NO_DEPRECATE" \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
@@ -694,11 +697,11 @@ $(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 
 $(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
 	@cd $(SRCDIR)
-	$(TCL) csvtobib1.tcl
+	$(TCL) csvtobib1.tcl $(SRCDIR)
 
 $(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
 	@cd $(SRCDIR)
-	$(TCL) csvtosrw.tcl
+	$(TCL) csvtosrw.tcl $(SRCDIR)
 
 !endif