diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-06-30 11:06:45 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-06-30 11:06:45 +0300 |
| commit | 78a9581e01f1fc4a1d6d00b63e24f3a833afda96 (patch) | |
| tree | 6892a5148885d2b0ef16aac627f628f2a6a1b6b5 | |
| parent | b9e39a8df9e22622ee582945c472521afea3f3aa (diff) | |
| parent | d09360cd21c31323646b6df5eaf274ac845bff07 (diff) | |
| download | rabbitmq-server-git-78a9581e01f1fc4a1d6d00b63e24f3a833afda96.tar.gz | |
Merge pull request #204 from ingwinlu/python_detection
add detection for python2.7
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -29,6 +29,9 @@ USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes) PYTHON=python else +ifeq ($(shell python2.7 -c 'import json' 2>/dev/null && echo yes),yes) +PYTHON=python2.7 +else ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes) PYTHON=python2.6 else @@ -40,6 +43,7 @@ PYTHON=python endif endif endif +endif BASIC_PLT=basic.plt RABBIT_PLT=rabbit.plt |