From f66886517ee1fbd4acd34d9942d9edde802a8c7b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 7 Apr 2011 13:57:27 +0200 Subject: [PATCH] NSIS: Set InstallDir depending on x86/x64 --- win/yaz.nsi | 1 - win/yaz.win32.nsi | 2 ++ win/yaz.win64.nsi | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/win/yaz.nsi b/win/yaz.nsi index be73f62..9e45f74 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -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" "" diff --git a/win/yaz.win32.nsi b/win/yaz.win32.nsi index dfa475c..15c3843 100644 --- a/win/yaz.win32.nsi +++ b/win/yaz.win32.nsi @@ -2,5 +2,7 @@ !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" +InstallDir "$PROGRAMFILES\YAZ" + !include yaz.nsi diff --git a/win/yaz.win64.nsi b/win/yaz.win64.nsi index c2be7d4..63208ba 100644 --- a/win/yaz.win64.nsi +++ b/win/yaz.win64.nsi @@ -2,5 +2,7 @@ !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\msvc*90.dll" !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" +InstallDir "$PROGRAMFILES64\YAZ" + !include yaz.nsi -- 1.7.10.4