X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=678b7417c074c54f5dca350a2f7157c64a209210;hb=7dca3501222dc961d4067367fc5222c48d36e0ef;hp=9f55d8f1edd33ed23eefc6430b446e7dbf7f6463;hpb=c7e1a7aece8464775951ce9186988f2a881c867f;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 9f55d8f..678b741 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,13 +1,14 @@
-; $Id: yaz.nsi,v 1.86 2006-06-07 11:18:04 adam Exp $
+; $Id: yaz.nsi,v 1.105 2007-03-07 08:05:26 adam Exp $
 
-!define VERSION "2.1.21"
+!define VERSION "2.1.52"
 
 ; Microsoft runtime CRT
 ; VS 2003
-; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
 
 ; VS 2005
-!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+;!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
 
 !include "MUI.nsh"
 
@@ -90,12 +91,14 @@ Section "YAZ Runtime" YAZ_Runtime
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME}"
+	File "${VS_RUNTIME_DLL}"
+;	File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\iconv.dll
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
 	File ..\bin\libxslt.dll
 	File ..\bin\yaz.dll
+;	File ..\bin\*.manifest
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -115,9 +118,6 @@ Section "YAZ Development" YAZ_Development
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
 	File ..\lib\yaz.lib
-	File ..\lib\yazd.lib
-	SetOutPath $INSTDIR\bin
-	File ..\bin\yazd.dll
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation