[mlpack-svn] r15774 - mlpack/conf/jenkins-conf/benchmark

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Fri Sep 13 15:29:01 2013
New Revision: 15774

Log:
Fix for if python3.3 is installed but python3.2 is not (i.e., if python3.2 is
not available, just look for python3 before looking for just python, which might
be python2).


Modified:
   mlpack/conf/jenkins-conf/benchmark/Makefile

Modified: mlpack/conf/jenkins-conf/benchmark/Makefile
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/Makefile	(original)
+++ mlpack/conf/jenkins-conf/benchmark/Makefile	Fri Sep 13 15:29:01 2013
@@ -1,7 +1,10 @@
 # Locate the python bin.
 PYTHON_BIN := $(shell which python3.2)
 ifndef PYTHON_BIN
-  PYTHON_BIN := $(shell which python)
+  PYTHON_BIN := $(shell which python3)
+  ifndef PYTHON_BIN
+    PYTHON_BIN := $(shell which python)
+  endif
 endif
 
 ifdef PYTHON_BIN
@@ -66,12 +69,12 @@
 .check:
 ifndef YAML_INSTALLED
 	@echo "$(ERROR_COLOR)[ERROR]$(NO_COLOR) The python 'yaml' module was not \
-	found please install the yaml module to start the benchmark script."
+	found; please install the yaml module to start the benchmark script."
 	@exit 1
 endif
 
 ifndef PYTHON_BIN
-	@echo "$(ERROR_COLOR)[ERROR]$(NO_COLOR) Python not found please install \
+	@echo "$(ERROR_COLOR)[ERROR]$(NO_COLOR) Python not found; please install \
 	python to start the benchmark script."
 	@exit 1
 else