diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2009-12-18 15:36:58 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2009-12-18 15:36:58 +0000 |
| commit | 21b9b3d0d7c337fd562e2d03610a7fd8ea1b03dc (patch) | |
| tree | 28a5906c4f5c68d165ef45c30e89f30aa57e2e56 /Makefile | |
| parent | c706e4f9d3daebd9ed992e3280ff2b0b921af347 (diff) | |
| parent | d74a371b279a99373f5580084879b5e12e2a8e62 (diff) | |
| download | rabbitmq-server-git-21b9b3d0d7c337fd562e2d03610a7fd8ea1b03dc.tar.gz | |
Merge no-pluggable-exchange branch into v1.7-series branch.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -15,7 +15,20 @@ TARGETS=$(EBIN_DIR)/rabbit.app $(BEAM_TARGETS) WEB_URL=http://stage.rabbitmq.com/ MANPAGES=$(patsubst %.pod, %.gz, $(wildcard docs/*.[0-9].pod)) +ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes) PYTHON=python +else +ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes) +PYTHON=python2.6 +else +ifeq ($(shell python2.5 -c 'import simplejson' 2>/dev/null && echo yes),yes) +PYTHON=python2.5 +else +# Hmm. Missing simplejson? +PYTHON=python +endif +endif +endif BASIC_PLT=basic.plt RABBIT_PLT=rabbit.plt @@ -46,7 +59,7 @@ ERL_EBIN=erl -noinput -pa $(EBIN_DIR) all: $(TARGETS) $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app - escript generate_app $(EBIN_DIR) < $< > $@ + escript generate_app $(EBIN_DIR) $@ < $< $(EBIN_DIR)/gen_server2.beam: $(SOURCE_DIR)/gen_server2.erl erlc $(ERLC_OPTS) $< |