diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-09-16 16:25:53 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-09-16 16:25:53 +0000 |
| commit | 33cfe1725a4d649f764a8e2a4970c41247d65daf (patch) | |
| tree | 977f370a6e0accf879aa0b840fa7dc0ee9d9c339 /config.nmake | |
| parent | 092c0c20ed25b21f5b07d00e3fafed6c5ae6ad58 (diff) | |
Sort each conversation column numerically. Fix up whitespace.
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing. Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake. The rest of the occurrences of xcopy will have to
be taken care of at some point.
svn path=/trunk/; revision=15840
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index bd16475a76..18c5213a20 100644 --- a/config.nmake +++ b/config.nmake @@ -240,7 +240,10 @@ MAKENSIS_MODERN_UI=USE # According to http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=403 # XCOPY under Windows NT doesn't support the "/Y" flag. This works # around that bug. -COPYCMD=/Y +# XXX - This apparently doesn't work for some versions of nmake: +# http://support.microsoft.com/default.aspx?scid=kb;en-us;86814 +# It looks like we'll have to call "set copycmd=/y" before we run xcopy. +COPYCMD=/y # If you don't want to build libethereal.dll, you should comment out the # following line. (Note: for plugin support this option must stay activated) @@ -361,4 +364,4 @@ LIBETHEREAL_CONFIG= !ENDIF # Construct the path -PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
\ No newline at end of file +PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH) |