On my system NSIS installs in the path defined in environment variable

ProgramFiles(x86)=C:\Program Files (x86)
Add that to the locations where we look for it. I couldn't use
ProgramFiles(x86) as a constant so put the path verbatim.

Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f
Reviewed-on: https://code.wireshark.org/review/6651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2015-01-19 15:24:47 +01:00 committed by Anders Broman
parent c8bca4fa9a
commit de4164fefb
1 changed files with 2 additions and 0 deletions

View File

@ -870,6 +870,8 @@ TEXTIFY=$(POWERSHELL) $(TOOLS_DIR)/textify.ps1
MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe"
!ELSE IF EXIST("$(PROGRAM_FILES_W6432)\NSIS\makensis.exe")
MAKENSIS="$(PROGRAM_FILES_W6432)\NSIS\makensis.exe"
!ELSE IF EXIST("\Program Files (x86)\NSIS\makensis.exe")
MAKENSIS="\Program Files (x86)\NSIS\makensis.exe"
!ENDIF
!ENDIF