diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-04 05:41:53 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-04 05:41:53 +0000 |
| commit | 4f7cc5654463570a22bf0ecd8a6013c51747b673 (patch) | |
| tree | e25808951112f7e5c3f8e6eada16ea8d66f5db11 /config.nmake | |
| parent | 6d946c088dfbc218b3a6cffd9b56cedce8823b18 (diff) | |
Use 'igncr' as needed with Bash (workaround for bug report 1162);
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20034 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index 6c5dce2ae3..e8465c59ba 100644 --- a/config.nmake +++ b/config.nmake @@ -247,7 +247,19 @@ AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap # The easiest way is to use the corresponding packages from cygwin. # command for a shell (cygwin's bash package recommended) -SH=bash +SH_PROG=bash + +# bash versions after 3.1.6 need the 'igncr' shell option to be able to +# process scripts in windows 'native format' (dos crlf format). +# 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 +SH_FLAGS=-o igncr +!endif + +SH=$(SH_PROG) $(SH_FLAGS) + # command for perl (cygwin's perl package recommended) PERL=perl |