diff options
| author | Bill Meier <wmeier@newsguy.com> | 2006-12-04 05:41:53 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2006-12-04 05:41:53 +0000 |
| commit | bf209eec73ca11007c22cfffe8296b21311f92ec (patch) | |
| tree | e25808951112f7e5c3f8e6eada16ea8d66f5db11 /epan/Makefile.nmake | |
| parent | 990fc9d88a6820fb1989062b78b0a3db5ac887bf (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);
svn path=/trunk/; revision=20034
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index e77ee223f4..ab9b44f6d3 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -88,7 +88,7 @@ libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter $(WSLUA_DI ..\config.h : ..\config.h.win32 ..\config.nmake cd .. - $(MAKE) -f Makefile.nmake config.h + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake config.h cd epan clean: |