Преглед изворни кода

Use $(PYTHON) instead of hard-coded "python"

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39443 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements пре 15 година
родитељ
комит
94c65cbc4a

+ 1 - 1
gui/wxpython/Makefile

@@ -28,7 +28,7 @@ $(ETCDIR)/%: %
 
 menustrings.py: gui_modules/menudata.py xml/menudata.xml
 	GISBASE="$(GISBASE)" \
-	python $< > $@
+	$(PYTHON) $< > $@
 
 #doxygen:
 DOXNAME=wxpython

+ 1 - 1
gui/wxpython/nviz/Makefile

@@ -46,7 +46,7 @@ $(SHLIB): $(LIB_NAME).i
 	WXWIDGETSLIB="$(WXWIDGETSLIB)" \
 	OPENGL_X11="$(OPENGL_X11)" \
 	XCFLAGS="$(XCFLAGS)" \
-	python setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
+	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp
 

+ 1 - 1
gui/wxpython/vdigit/Makefile

@@ -40,7 +40,7 @@ $(SHLIB): $(LIB_NAME).i
 	GEOSCFLAGS="$(GEOSCFLAGS)" \
 	WXWIDGETSCXXFLAGS="$(WXWIDGETSCXXFLAGS)" \
 	WXWIDGETSLIB="$(WXWIDGETSLIB)" \
-	python setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
+	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp
 

+ 1 - 0
include/Make/Platform.make.in

@@ -213,6 +213,7 @@ CAIRO_HAS_XRENDER         = @CAIRO_HAS_XRENDER@
 CAIRO_HAS_XRENDER_SURFACE = @CAIRO_HAS_XRENDER_SURFACE@
 
 #Python
+PYTHON              = python
 PYTHONINC           = @PYTHONINC@
 PYTHONCFLAGS        = @PYTHONCFLAGS@
 PYTHONLDFLAGS       = @PYTHONLDFLAGS@

+ 0 - 1
include/Make/Python.make

@@ -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)

+ 2 - 1
swig/python/Makefile

@@ -53,13 +53,14 @@ DSTDIR = $(GDIR)/lib
 
 LIBFILES := $(patsubst %,$(DSTDIR)/_%.so,$(MODULES))
 PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
+PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
 LLIBFILES := $(patsubst %,_%.so,$(MODULES))
 WRAPFILES := $(patsubst %,%_wrap.c,$(MODULES))
 LPYFILES := $(patsubst %,%.py,$(MODULES))
 
 default:
 	$(MAKE) $(DSTDIR)
-	$(MAKE) $(LLIBFILES) $(WRAPFILES) $(LPYFILES) $(LIBFILES) $(PYFILES)
+	$(MAKE) $(LLIBFILES) $(WRAPFILES) $(LPYFILES) $(LIBFILES) $(PYFILES) $(PYCFILES)
 
 %_wrap.c %.py: ../include/%.i $(EXTRA_SWIG)
 	$(SWIG) $(SWIGFLAGS) -python -o $*_wrap.c -module $* -shadow $<

+ 2 - 2
swig/python/NumPtr/Makefile

@@ -3,9 +3,9 @@
 all: numptr
 
 numptr:
-	python setup.py build --build-lib build/lib
+	$(PYTHON) setup.py build --build-lib build/lib
 	# build bytecode .pyc file
-	python build/lib/test.py >& /dev/null
+	$(PYTHON) build/lib/test.py >& /dev/null
 
 clean:
 	-rm -rf build/