X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=a2034cee79878b54d15fe9abbd9d05292a4d8235;hp=fdd07af27c9abe89bea8b730be0c2ab4db764a98;hb=4f8ea8cfaf2f3d95e4efcf9494526c2b4be43eb8;hpb=24e8ba4deca04c30ead995e4c961f08027e120a9

diff --git a/win/yaz.nsi b/win/yaz.nsi
index fdd07af..a2034ce 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,13 +1,14 @@
-; $Id: yaz.nsi,v 1.87 2006-06-07 14:25:43 adam Exp $
+; $Id: yaz.nsi,v 1.103 2007-01-23 19:31:12 adam Exp $
 
-!define VERSION "2.1.21"
+!define VERSION "2.1.48"
 
 ; 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,13 +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\*.manifest
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \