From bc9313eae3f0735bf3382d994af1cfd558cd6991 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 19 Aug 2004 07:42:20 +0000
Subject: [PATCH] Distribute msvcr71.dll with dist. Do not distribute yaz
 debug DLLs.

---
 win/makefile |    8 +++++---
 win/yaz.nsi  |    7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/win/makefile b/win/makefile
index 2a6d3ce..8f43187 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2004, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.83 2004-08-18 10:47:48 adam Exp $
+# $Id: makefile,v 1.84 2004-08-19 07:42:20 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -41,13 +41,15 @@ all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
 
 NSIS="c:\program files\nsis\makensis.exe"
 
-nsis: 
+dist: 
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
-	nmake DEBUG=1 dll
 	nmake DEBUG=0
 	$(NSIS) yaz.nsi
 
+nsis:
+	$(NSIS) yaz.nsi
+
 nsishelp:
 	$(NSIS)
 
diff --git a/win/yaz.nsi b/win/yaz.nsi
index 11bb789..7546f36 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,4 +1,4 @@
-; $Id: yaz.nsi,v 1.52 2004-08-18 09:01:13 adam Exp $
+; $Id: yaz.nsi,v 1.53 2004-08-19 07:42:20 adam Exp $
 
 !define VERSION "2.0.23"
 
@@ -83,6 +83,7 @@ Section "YAZ Runtime" YAZ_Runtime
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
+	File c:\winnt\system32\msvcr71.dll
 	File ..\bin\iconv.dll
 	File ..\bin\zlib.dll
 	File ..\bin\libxml2.dll
@@ -105,9 +106,7 @@ Section "YAZ Development" YAZ_Development
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
-	File ..\lib\*.lib
-	SetOutPath $INSTDIR\bin
-	File ..\bin\yazdebug.dll
+	File ..\lib\yaz.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
-- 
1.7.10.4