diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2015-02-12 10:03:37 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-12 14:16:49 +0000 |
| commit | 7594d96e7de9e01240075cca35dd793467495f94 (patch) | |
| tree | c4b2171f053302d3150ff83779a286b7d6afa570 /config.nmake | |
| parent | 34acb73df1fe38c3b2a1ac4e9e7df74bacc3140c (diff) | |
nmake: Allow Cygwin path to be provided
I have installed cygwin at a different location then the default
location. Therefore the nmake steps tend to fail, and I will have
to adapt the config.nmake script every time.
This patch allows the CYGWIN_PATH variable to be set outside
the build-script
Change-Id: Iaecdd2aa72a0529574fab7e6aeae18fbfd621721
Reviewed-on: https://code.wireshark.org/review/7078
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index c7676c7182..40a4a2ee4e 100644 --- a/config.nmake +++ b/config.nmake @@ -781,7 +781,9 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas # 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) +!IF EXIST($(CYGWIN_PATH)) +# Do nothing +!ELSE IF EXIST(C:\cygwin\bin) CYGWIN_PATH=C:\cygwin\bin !ELSE IF EXIST(C:\cygwin64\bin) CYGWIN_PATH=C:\cygwin64\bin |