diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-08-07 14:07:16 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-08-07 21:54:54 +0000 |
| commit | 714fa85d85225307af42e2194e551b8087e617dd (patch) | |
| tree | 7ff8c9477fad1141b6cb2e8b2f89dc0c388849da /config.nmake | |
| parent | 1dc88edc2c3283620adc941a38d5c26cdc1e79c4 (diff) | |
Win flex-bison and Chocolatey updates.
Chocolatey's latest winflexbison package is usable. Update
config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly. Rename
CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're
finding.
Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb
Reviewed-on: https://code.wireshark.org/review/3479
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index 6752310604..22dd038e8f 100644 --- a/config.nmake +++ b/config.nmake @@ -803,13 +803,8 @@ SED=sed # recommended. # Absolute or relative paths must be Windows-style -# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are -# currently unusable without some manual adjustments to the -# win_flex and win_bison wrapper scripts. Calling the executables -# directly should work. - #LEX=win_flex -#LEX=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_flex +#LEX=%ChocolateyInstall%\bin\win_flex LEX=flex # Command for yacc/bison. Cygwin's bison or Chocolatey's win_bison @@ -817,7 +812,7 @@ LEX=flex # Absolute or relative paths must be Windows-style #YACC=win_bison -#YACC=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_bison +#YACC=%ChocolateyInstall%\bin\win_bison YACC=bison # Commands to convert UNIX line endings to DOS/Windows |