diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-01 13:18:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-01 20:19:03 +0000 |
| commit | e696d0f93d7a86c43e8fac8f905cc7a0f18ef797 (patch) | |
| tree | 9697b5ce61955ce421dcbeb4ebba829eba8d734d /config.nmake | |
| parent | aa0f80981a34ce4361e97748a51b483d083cd8ea (diff) | |
Fix the checks for the Cygwin path.
I.e., do
if we have 32-bit Cygwin
CYGWIN_PATH=path to it
else if we have 64-bit Cygwin
CYGWIN_PATH=path to it
else
fail
endif
rather than
CYGWIN_PATH=standard path for 32-bit Cygwin
if we don't have 32-bit cygwin and we do have 64-bit Cygwin
CYGWIN_PATH=path to 64-bit cygwin
else
fail
endif
as the latter will fail if we *do* have 32-bit Cygwin.
Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa
Reviewed-on: https://code.wireshark.org/review/2756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index 90695fee57..eca4b36058 100644 --- a/config.nmake +++ b/config.nmake @@ -755,13 +755,14 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas ##### Tools ##### # Set the following mandatory commands to find the tools. -# The easiest way is to use the corresponding packages from cygwin. - -# Set up the path to the cygwin binaries -CYGWIN_PATH=c:\cygwin\bin - -# If that doesn't exist, check for a 64-bit cygwin installation -!IF !EXIST($(CYGWIN_PATH)) && EXIST(C:\cygwin64\bin) +# The easiest way is to use the corresponding packages from Cygwin. + +# Set up the path to the Cygwin binaries +# First check whether a 32-bit Cygwin installation exists +# If not, check for a 64-bit Cygwin installation +!IF EXIST(C:\cygwin\bin) +CYGWIN_PATH=C:\cygwin\bin +!ELSE IF EXIST(C:\cygwin64\bin) CYGWIN_PATH=C:\cygwin64\bin !ELSE !ERROR Could not locate Cygwin, please set CYGWIN_PATH explicitly in config.nmake |