[GRASS-SVN] r43629 - grass/branches/releasebranch_6_4/include/Make

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-09-22 20:07:09 +0000 (Wed, 22 Sep 2010)
New Revision: 43629

Modified:
   grass/branches/releasebranch_6_4/include/Make/Platform.make.in
   grass/branches/releasebranch_6_4/include/Make/Python.make
Log:
backport: python definition cleanup

Modified: grass/branches/releasebranch_6_4/include/Make/Platform.make.in
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Platform.make.in	2010-09-22 20:05:59 UTC (rev 43628)
+++ grass/branches/releasebranch_6_4/include/Make/Platform.make.in	2010-09-22 20:07:09 UTC (rev 43629)
@@ -211,6 +211,7 @@
 USE_CAIRO           = @USE_CAIRO@
 
 #Python
+PYTHON              = python
 PYTHONINC           = @PYTHONINC@
 PYTHONCFLAGS        = @PYTHONCFLAGS@
 PYTHONLDFLAGS       = @PYTHONLDFLAGS@
@@ -243,8 +244,8 @@
 
 MINGW		    = @MINGW32@
 MACOSX_APP	    = @MACOSX_APP@
-MACOSX_ARCHS    = @MACOSX_ARCHS@
-MACOSX_SDK      = @MACOSX_SDK@
+MACOSX_ARCHS        = @MACOSX_ARCHS@
+MACOSX_SDK          = @MACOSX_SDK@
 
 # Cross compilation
 CROSS_COMPILING = @CROSS_COMPILING@ 

Modified: grass/branches/releasebranch_6_4/include/Make/Python.make
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Python.make	2010-09-22 20:05:59 UTC (rev 43628)
+++ grass/branches/releasebranch_6_4/include/Make/Python.make	2010-09-22 20:07:09 UTC (rev 43629)
@@ -1,5 +1,4 @@
 
-PYTHON = python
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 PYMOD_LD = $(CXX) -bundle -undefined dynamic_lookup
 PYMOD_LDFLAGS := $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR)
@@ -9,6 +8,8 @@
 endif
 PYMOD_CFLAGS = $(SHLIB_CFLAGS) $(PYTHONINC) $(PYTHON_CFLAGS)
 
+PY_SOURCES := $(wildcard *.py)
+
 %.pyc: %.py
 	$(PYTHON) -m py_compile $<