diff --git a/mswin32/Makefile b/mswin32/Makefile index 717d21268..dd9dd15f9 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -40,8 +40,8 @@ winbuild: cd Release && cp -r ../../docs/licenses ../nmap-$(NMAP_VERSION)/ rm -rf nmap-$(NMAP_VERSION)/licenses/.svn cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION) - cp vcredist_x86.exe nmap-$(NMAP_VERSION) - cp vcredist2008_x86.exe nmap-$(NMAP_VERSION) + cp $(NMAP_MSWIN32_AUX)/vcredist_x86.exe nmap-$(NMAP_VERSION) + cp $(NMAP_MSWIN32_AUX)/vcredist2008_x86.exe nmap-$(NMAP_VERSION) cp ../ncat/Release/ncat.exe nmap-$(NMAP_VERSION) cp ../ncat/Release/ca-bundle.crt nmap-$(NMAP_VERSION) cp ../nping/Release/nping.exe nmap-$(NMAP_VERSION) diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index 00531a16d..a2ebae040 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -310,7 +310,7 @@ Function vcredist2010installer ;If VC++ 2010 runtimes are not installed... vcredist_silent_install: DetailPrint "Installing Microsoft Visual C++ 2010 Redistributable" - File ..\vcredist_x86.exe + File ..\nmap-${VERSION}\vcredist_x86.exe ExecWait '"$INSTDIR\vcredist_x86.exe" /q' $0 ;Check for successful installation of our vcredist_x86.exe... ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{196BB40D-1578-3D01-B289-BEFC77A11A1E}" "DisplayName" @@ -338,7 +338,7 @@ Function vcredist2008installer ;If VC++ 2008 runtimes are not installed... vcredist2008_silent_install: DetailPrint "Installing Microsoft Visual C++ 2008 Redistributable" - File ..\vcredist2008_x86.exe + File ..\nmap-${VERSION}\vcredist2008_x86.exe ExecWait '"$INSTDIR\vcredist2008_x86.exe" /q' $0 ;Check for successful installation of our 2008 version of vcredist_x86.exe... ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{86CE85E6-DBAC-3FFD-B977-E4B79F83C909}" "DisplayName" diff --git a/mswin32/vcredist2008_x86.exe b/mswin32/vcredist2008_x86.exe deleted file mode 100644 index 823345da7..000000000 Binary files a/mswin32/vcredist2008_x86.exe and /dev/null differ diff --git a/mswin32/vcredist_x86.exe b/mswin32/vcredist_x86.exe deleted file mode 100644 index ce5c5249d..000000000 Binary files a/mswin32/vcredist_x86.exe and /dev/null differ