diff options
| author | Bill Meier <wmeier@newsguy.com> | 2006-12-26 22:40:49 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2006-12-26 22:40:49 +0000 |
| commit | 81ab78cddb440b504fb58bd0a11718bd933c406d (patch) | |
| tree | ad7e5c564e08fd9e7d2506f3e88e1e8937587515 /config.nmake | |
| parent | 37d4a402541771284f2acfb58f67db5047058461 (diff) | |
Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
I violated Murphy's nth law: thou shalt test fixes in an
'out of the box' configuration *not* in one's customized configuration.
:(
svn path=/trunk/; revision=20221
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 4efbeeac4b..036f053875 100644 --- a/config.nmake +++ b/config.nmake @@ -249,6 +249,9 @@ GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 # 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 + # command for a shell (cygwin's bash package recommended) SH_PROG=bash @@ -257,7 +260,7 @@ SH_PROG=bash # The following !IF results in the option being used only if it is available # since using it on bash version 3.1.6 (or earlier) is not required and # will cause an error message. -!if "$(SH_PROG)"=="bash" && [bash -c "set -o igncr" 2>nul: ] == 0 +!if "$(SH_PROG)"=="bash" && [$(CYGWIN_PATH)\bash -c "set -o igncr" 2>nul: ] == 0 SH_FLAGS=-o igncr !endif @@ -342,9 +345,6 @@ LOCAL_LDFLAGS=/DEBUG # Set PDB_FILE according to your VC++ version PDB_FILE=vc*.pdb -# Set up the path to the cygwin binaries -CYGWIN_PATH=c:\cygwin\bin - # # Optional: Use the User's Guide as the online help system # (currently experimental). |