From 77c8179d2e065595bab9de33cc4d4aa23c2e2216 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <rco@iptel.org>
Date: Tue, 18 May 2010 09:27:15 +0000
Subject: [PATCH] - fixes cross-compilation when the target system has a
 different python version as the host system.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1897 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/ivr/Makefile                 | 2 --
 apps/ivr/Makefile.defs            | 3 +++
 apps/ivr/Makefile.ivr_application | 2 +-
 apps/py_sems/Makefile             | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/ivr/Makefile b/apps/ivr/Makefile
index c244c596..adfe22c9 100644
--- a/apps/ivr/Makefile
+++ b/apps/ivr/Makefile
@@ -1,8 +1,6 @@
 plug_in_name = ivr
 
 include Makefile.defs
-PY_VER = $(PYTHON_VERSION)
-PY_EXE = python$(PY_VER)
 
 COREPATH ?=../../core
 
diff --git a/apps/ivr/Makefile.defs b/apps/ivr/Makefile.defs
index 5182eea5..7e68920a 100644
--- a/apps/ivr/Makefile.defs
+++ b/apps/ivr/Makefile.defs
@@ -2,6 +2,9 @@
 #
 PYTHON_VERSION ?= $(shell python -c 'import sys;print sys.version[0:3]')
 
+PY_VER = $(PYTHON_VERSION)
+PY_EXE = python$(PY_VER)
+
 # For flite text-to-speech set TTS = y
 #
 TTS ?= n
diff --git a/apps/ivr/Makefile.ivr_application b/apps/ivr/Makefile.ivr_application
index 159d01f0..fc650123 100644
--- a/apps/ivr/Makefile.ivr_application
+++ b/apps/ivr/Makefile.ivr_application
@@ -36,7 +36,7 @@ clean:
 
 .PHONY: compile
 compile: 
-	python${PYTHON_VERSION} $(IVRPATH)/py_comp -q .
+	$(PY_EXE) $(IVRPATH)/py_comp -q .
 
 .PHONY: install
 install: all $(extra_install)
diff --git a/apps/py_sems/Makefile b/apps/py_sems/Makefile
index b4371ea0..5dac1be7 100644
--- a/apps/py_sems/Makefile
+++ b/apps/py_sems/Makefile
@@ -48,7 +48,7 @@ py_obj = $(py_src:.py=.pyc)
 ifeq (all,$(MAKECMDGOALS))
 .PHONY: python_files
 python_files: 
-	python$(PY_VER) py_comp -l -q py &&\
+	$(PY_EXE) py_comp -l -q py &&\
 	cp py/*.pyc $(COREPATH)/lib
 
 endif
@@ -56,20 +56,20 @@ endif
 ifeq (,$(MAKECMDGOALS))
 .PHONY: python_files
 python_files: 
-	python$(PY_VER) py_comp -l -q py &&\
+	$(PY_EXE) py_comp -l -q py &&\
 	cp py/*.pyc $(COREPATH)/lib
 
 endif
 
 ifeq (module_package,$(MAKECMDGOALS))
 python_files:
-	python$(PY_VER) py_comp -l -q py
+	$(PY_EXE) py_comp -l -q py
 
 endif
 
 ifeq (install,$(MAKECMDGOALS))
 python_files:
-	python$(PY_VER) py_comp -l -q py
+	$(PY_EXE) py_comp -l -q py
 
 endif