Turn around the sequence of PATH, so the former PATH will be in front of the newly...

This way, the cygwin link.exe command will be behind the link.exe from MSVC.

Also added a definition of the docbook dir, floating around in my personal file for a while. This will be needed if the User's Guide is included in the NSIS installer later.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15790 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.nmake b/config.nmake
index eb5c720bf6a984b6b100aacd3a2bf25f0616cefd..bd16475a764c6d9a774791ed4a7bc529696053e8 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -33,6 +33,15 @@ RC_WTAP_VERSION=0,3
 #
 WINPCAP_VERSION=3.0
 
+# 
+# Directory, where your User's Guide reside, relative to the source dir.
+# (currently unused)
+#
+# If you don't have the User's Guide, comment this line out, so that 
+# ETHEREAL_EUG_DIR isn't defined.
+#
+#ETHEREAL_EUG_DIR=docbook/eug_html_chunked
+
 # 
 # Base directory, where your libraries reside, which needs to be 
 # compiling the sources. This is only inside this file.
@@ -352,4 +361,4 @@ LIBETHEREAL_CONFIG=
 !ENDIF
 
 # Construct the path
-PATH=$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH);$(PATH)
\ No newline at end of file
+PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
\ No newline at end of file