diff options
| author | Patrik Nyblom <[email protected]> | 2010-11-04 17:53:21 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-11-30 16:30:47 +0100 |
| commit | c5a67411ce1af7f12184ed3d645c794674cea8f9 (patch) | |
| tree | c1d8f75fb2ee707e22161d5aae0ca77a429542d2 /erts/etc/win32/nsis/erlang20.nsi | |
| parent | 63eeba2f6829aac2644eaf212ebef9cdf4b59e8d (diff) | |
| download | otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.tar.gz otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.tar.bz2 otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.zip | |
Allow installer to take redistributables from VC9
Diffstat (limited to 'erts/etc/win32/nsis/erlang20.nsi')
| -rw-r--r-- | erts/etc/win32/nsis/erlang20.nsi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi index 43e5d91604..941e8e6f5d 100644 --- a/erts/etc/win32/nsis/erlang20.nsi +++ b/erts/etc/win32/nsis/erlang20.nsi @@ -311,23 +311,23 @@ FunctionEnd Function .onInit
SectionGetFlags 0 $MYTEMP
-; MessageBox MB_YESNO "Found $SYSDIR\msvcr80.dll" IDYES FoundLbl
- IfFileExists $SYSDIR\msvcr80.dll MaybeFoundInSystemLbl
+ ;MessageBox MB_YESNO "Found $SYSDIR\${REDIST_DLL_NAME}" IDYES FoundLbl
+ IfFileExists $SYSDIR\${REDIST_DLL_NAME} MaybeFoundInSystemLbl
SearchSxsLbl:
FindFirst $0 $1 $WINDIR\WinSxS\x86*
LoopLbl:
StrCmp $1 "" NotFoundLbl
- IfFileExists $WINDIR\WinSxS\$1\msvcr80.dll MaybeFoundInSxsLbl
+ IfFileExists $WINDIR\WinSxS\$1\${REDIST_DLL_NAME} MaybeFoundInSxsLbl
FindNext $0 $1
Goto LoopLbl
MaybeFoundInSxsLbl:
- GetDllVersion $WINDIR\WinSxS\$1\msvcr80.dll $R0 $R1
+ GetDllVersion $WINDIR\WinSxS\$1\${REDIST_DLL_NAME} $R0 $R1
Call DllVersionGoodEnough
FindNext $0 $1
IntCmp 2 $R0 LoopLbl
Goto FoundLbl
MaybeFoundInSystemLbl:
- GetDllVersion $SYSDIR\msvcr80.dll $R0 $R1
+ GetDllVersion $SYSDIR\${REDIST_DLL_NAME} $R0 $R1
Call DllVersionGoodEnough
IntCmp 2 $R0 SearchSxSLbl
FoundLbl:
|