aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2007-09-27 08:33:53 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2007-09-27 08:33:53 +0000
commit6055995bf1023a54d04344e82b3cf722acd82dc9 (patch)
treefc6579ae74818530e4f78d742ce63e30a7659cb6 /config.nmake
parent7c241d83c202fc293718e4b39ddb80ee27c035ec (diff)
revert changes in config.nmake committed by mistake and commit configure.in
svn path=/trunk/; revision=22996
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake
index 43cc1c8a65..7a9ce5a526 100644
--- a/config.nmake
+++ b/config.nmake
@@ -29,7 +29,7 @@ WTAP_VERSION_MICRO=1
# Base directory, where your libraries reside, which are needed to
# compile the sources. This setting is used only inside this file.
#
-WIRESHARK_LIBS=D:\Ethereal
+WIRESHARK_LIBS=C:\wireshark-win32-libs
#
# Base directory, where your programs reside.
@@ -319,7 +319,7 @@ POD2HTML=$(SH) pod2html
PYTHON="C:/python24/python.exe"
#PYTHON="C:/python25/python.exe"
# add native python to the path (not needed if cygwin's python is used)
-#PATH=c:\python24;$(PATH)
+PATH=c:\python24;$(PATH)
#PATH=c:\python25;$(PATH)
# command for python (cygwin's python package, not recommended)
@@ -339,7 +339,7 @@ YACC=bison
# If you don't have NSIS, comment this line out, so that MAKENSIS
# isn't defined.
#
-#MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
+MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
#
# Optional: To build the developers API documentation with doxygen and dot.
@@ -371,7 +371,7 @@ YACC=bison
# If you don't want the online help (or don't have the tools),
# comment this line out, so that HHC_DIR isn't defined.
#
-#HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
+HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
##### Flags, PATHs and Miscellaneous #####
@@ -792,7 +792,7 @@ LIBWIRESHARK_CONFIG=
!ENDIF
# Construct the path
-PATH=$(CYGWIN_PATH);$(PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
+PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
# "convert" the MSVC variant into the required MSC compiler version