diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-28 16:29:39 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-28 16:29:39 +0000 |
| commit | 2086b8cb16f259e1bf67b3c15b6be53744c00d49 (patch) | |
| tree | 68a79c8b9d918d9287a3aec3e4ff584a9fe67b00 /config.nmake | |
| parent | 75cbccda5171043f0888132adbaa410249ff95fa (diff) | |
From g.khueny via bug 5346:
If PYTHON_DIR is specificed in config.nmake the variable will be overritten by
PYTHON_DIR=C:\Python$(PYTHON_VER).
It looks like the problem was created by revision 34246.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34673 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index d9bde5b8d2..d4a23a4638 100644 --- a/config.nmake +++ b/config.nmake @@ -173,6 +173,11 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe # #PYTHON=env python +# Santity check: native vs Cygwin Python options +!IF DEFINED(PYTHON) && DEFINED(PYTHON_DIR) +!ERROR PYTHON and PYTHON_DIR cannot be specified at the same time +!ENDIF + # Find native Python automatically if PYTHON(_DIR) wasn't defined !IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR) !IF EXIST(c:\Python27\python.exe) @@ -184,16 +189,11 @@ PYTHON_VER=25 !ELSE IF EXIST(c:\Python24\python.exe) PYTHON_VER=24 !ENDIF -!ENDIF - -# Santity check: native vs Cygwin Python options -!IF DEFINED(PYTHON) && DEFINED(PYTHON_DIR) -!ERROR PYTHON and PYTHON_DIR cannot be specified at the same time -!ENDIF !IF DEFINED(PYTHON_VER) PYTHON_DIR=C:\Python$(PYTHON_VER) !ENDIF +!ENDIF !IF DEFINED(PYTHON_DIR) PYTHON="$(PYTHON_DIR)\python.exe" |