diff options
| author | Bill Meier <wmeier@newsguy.com> | 2006-10-09 02:07:44 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2006-10-09 02:07:44 +0000 |
| commit | cf201496162307772c31c19bba651bcbbf6e5be4 (patch) | |
| tree | b6968f74b14482a8aa8cc8d711bea11ea1bf9324 /Makefile.nmake | |
| parent | 2bf897b9063e73d9a43570ebf1d9b905699a8cca (diff) | |
If GTK1_DIR or GTK2_DIR not defined, then corresponding install-common-deps should not be invoked....
svn path=/trunk/; revision=19458
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index f5dbd18c70..bdf3ddc297 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -470,7 +470,7 @@ doxygen: doxygen.cfg doxygen-run # Prepare build environment by downloading and installing required libraries ################################################################################ -# The required tools to build Ethereal. +# The required tools to build Wireshark. # # The 'find' tool is available both in \WINNT\System32 and in cygwin's /usr/bin. # We only need the cygwin version (for some shell scripts). @@ -819,12 +819,16 @@ install-deps2: install-common-deps2 !ENDIF install-common-deps1: +!IFDEF GTK1_DIR set INSTALL_DIR=$(INSTALL1_DIR) nmake -f Makefile.nmake install-common-deps +!ENDIF install-common-deps2: +!IFDEF GTK2_DIR set INSTALL_DIR=$(INSTALL2_DIR) nmake -f Makefile.nmake install-common-deps +!ENDIF install-common-deps: set copycmd=/y |