diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-10-14 16:37:47 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-10-14 16:37:47 +0000 |
| commit | f5b461c34f5f97bfe71ac050317384dc8f163146 (patch) | |
| tree | 125ea13b4bc6c457b1efd699cc3f314df9983899 /config.nmake | |
| parent | c2515c5abd30f2c1d821385c50ca5f56a16db1af (diff) | |
If PYTHON hasn't been defined, look for Python 2.6, 2.5, and 2.4 (in
that order). If found, set up Python automatically.
svn path=/trunk/; revision=26452
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/config.nmake b/config.nmake index 0515256bd0..b3d0eff15a 100644 --- a/config.nmake +++ b/config.nmake @@ -350,17 +350,30 @@ PERL=perl POD2MAN=$(SH) pod2man POD2HTML=$(SH) pod2html -# command for native windows python (recommended) -# both V2.4 and V2.5 should work -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:\python25;$(PATH) - -# command for python (cygwin's python package, not recommended) +# Command for native Windows Python (recommended) +# V2.4 to V2.6 should work + +# If you want to specify your Python settings, uncomment the lines below. +#PYTHON="C:\Python26\python.exe" +#PATH=c:\Python26;$(PATH) + +# Command for Cygwin's Python (not recommended) #PYTHON=env python +# Otherwise, find Python automatically. +!IF !DEFINED(PYTHON) +!IF EXIST(c:\Python26\python.exe) +PYTHON="C:\Python26\python.exe" +PATH=c:\Python26;$(PATH) +!ELSE IF EXIST(c:\Python25\python.exe) +PYTHON="C:\Python25\python.exe" +PATH=c:\Python25;$(PATH) +!ELSE IF EXIST(c:\Python24\python.exe) +PYTHON="C:\Python24\python.exe" +PATH=c:\Python24;$(PATH) +!ENDIF +!ENDIF + # command for lex/flexx (cygwin's flex recommended) LEX=flex |