X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=c96aa80473442cb292d380f16ea4d03be5bccd03;hp=a442b8172e355827c9248c106a19f2d4c7810539;hb=d4effebe5599237746102ef51bf2421f77943082;hpb=15401488340849487c2d7782121bef66dd19e961

diff --git a/win/yaz.nsi b/win/yaz.nsi
index a442b81..c96aa80 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,5 +1,5 @@
 ; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2010 Index Data
+; Copyright (C) 1995-2013 Index Data
 
 !include version.nsi
 
@@ -18,8 +18,8 @@
 ;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
 
 ; 4: VS 2008
-!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcr90.dll"
-!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+;!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
+;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
 
 
 !include "MUI.nsh"
@@ -37,7 +37,6 @@ ComponentText "This will install the YAZ Toolkit on your computer:"
 InstType "Full (w/ Source)"
 InstType "Lite (w/o Source)"
 
-InstallDir "$PROGRAMFILES\YAZ"
 InstallDirRegKey HKLM "SOFTWARE\Index Data\YAZ" ""
 
 
@@ -104,12 +103,7 @@ Noservice:
 	SetOutPath $INSTDIR\bin
 	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\icu*.dll
-	File ..\bin\yaz*.dll
+	File ..\bin\*.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -134,12 +128,12 @@ SectionEnd
 Section "YAZ Documentation" YAZ_Documentation
 	SectionIn 1 2
 	SetOutPath $INSTDIR\doc
-	File /r ..\doc\*.css
-	File /r ..\doc\*.ent
-	File /r ..\doc\*.html
+	File /nonfatal /r ..\doc\*.css
+	File /nonfatal /r ..\doc\*.ent
+	File /nonfatal /r ..\doc\*.html
 	File /r ..\doc\*.xml
 	File /r ..\doc\*.png
-	File /r ..\doc\*.xsl
+	File /nonfatal /r ..\doc\*.xsl
 	SetOutPath $SMPROGRAMS\YAZ
 	CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
                  "$INSTDIR\doc\index.html"
@@ -148,6 +142,7 @@ SectionEnd
 Section "YAZ Source" YAZ_Source
 	SectionIn 1
 	SetOutPath $INSTDIR
+	File ..\IDMETA
 	File /r ..\*.c
 	File /r /x yaz ..\*.h
 	SetOutPath $INSTDIR\util