Wireshark-commits: [Wireshark-commits] master-1.10 8364030: Add NSIS path discovery to config.nmake

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 20 Feb 2014 00:02:46 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=83640307e7538fd9586076c9e708b252c410977e
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

8364030 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Add NSIS path discovery to config.nmake.
    
    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
    (cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c)
    
    Change-Id: I42d6084e3699275d8212c6e37f8f776f12b343f3
    Reviewed-on: https://code.wireshark.org/review/262
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  5086c0e   Replace "svn" with "git" all over the place.
    adds  8364030   Add NSIS path discovery to config.nmake.


Summary of changes:
 config.nmake |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)