osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try 

to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
This commit is contained in:
Gerald Combs 2013-08-23 22:18:49 +00:00
parent fe0b28463f
commit dc87fa2d68
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config.nmake
View File

@ -58,6 +58,7 @@ WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs
# This setting is used only inside this file.
#
PROGRAM_FILES=$(PROGRAMFILES)
PROGRAM_FILES_W6432=$(PROGRAMW6432)
#
# Location of the "tools" directory. This affects HTML2TXT below and should
@ -730,14 +731,25 @@ UNIX2DOS=u2d
TEXTIFY=$(SH) $(TOOLS_DIR)/textify.sh
#
# Optional: To build the NSIS installer.
# Optional: Build the NSIS installer.
#
# If you have the NSIS package, set this to the NSIS executable.
# If NSIS is installed in a standard location (under Program Files
# or Program Files (x86)) you shouldn't have to change anything.
#
# If you don't have NSIS, comment this line out, so that MAKENSIS
# isn't defined.
# If NSIS is installed in a custom location uncomment the following
# line and adjust the path accordingly.
#
#MAKENSIS="\custom\path\to\NSIS\makensis.exe"
# Find NSIS automatically
!IF !DEFINED(MAKENSIS)
!IF EXIST("$(PROGRAM_FILES)\NSIS\makensis.exe")
MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe"
!ELSE IF EXIST("$(PROGRAM_FILES_W6432)\NSIS\makensis.exe")
MAKENSIS="$(PROGRAM_FILES_W6432)\NSIS\makensis.exe"
!ENDIF
!ENDIF
#
# Optional: To build the NSIS PortableApps installer.