diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-03 22:09:15 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-03 22:09:15 +0000 |
| commit | d736a37664fb82f051275d77de6912b357009e06 (patch) | |
| tree | ce5bd4925bc4ba41d5c7c0f7035577e503b037f0 /config.nmake | |
| parent | 1fd19fdba3402193e712e4ecca8b3fb51e54f810 (diff) | |
another attempt to fix the "Program Files" setting. Unfortunately, using the environment setting doesn't seem to work ...
svn path=/trunk/; revision=20297
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 85fed8c65b..32be1d1e30 100644 --- a/config.nmake +++ b/config.nmake @@ -52,14 +52,24 @@ MSVC_VARIANT=MSVC6 -##### Libraries ##### +##### Directories ##### # -# Base directory, where your libraries reside, which needs to be -# compiling the sources. This setting is used only inside this file. +# Base directory, where your libraries reside, which are needed to +# compile the sources. This setting is used only inside this file. # WIRESHARK_LIBS=C:\wireshark-win32-libs +# +# Base directory, where your programs reside. +# This setting is used only inside this file. +# +PROGRAM_FILES=C:/Program Files + + + +##### Libraries ##### + # # Mandatory: GLib settings # @@ -333,7 +343,7 @@ YACC=bison # If you don't have NSIS, comment this line out, so that MAKENSIS # isn't defined. # -MAKENSIS="%ProgramFiles%\nsis\makensis.exe" +MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" # # Optional: To build the developers documentation with doxygen and dot. @@ -348,7 +358,7 @@ MAKENSIS="%ProgramFiles%\nsis\makensis.exe" # If you don't want the developers documentation (or don't have the tools), # comment this line out, so that DOXYGEN isn't defined. # -#DOXYGEN="%ProgramFiles%/doxygen/bin/doxygen.exe" +#DOXYGEN="$(PROGRAM_FILES)/doxygen/bin/doxygen.exe" # # Optional: To build compressed html help format .chm and use it as online help format. @@ -362,7 +372,7 @@ MAKENSIS="%ProgramFiles%\nsis\makensis.exe" # 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="%ProgramFiles%/HTML Help Workshop/" +#HHC_DIR="$(PROGRAM_FILES)/HTML Help Workshop/" |