summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEssien Ita Essien <essiene@gmail.com>2008-12-26 10:29:00 +0100
committerEssien Ita Essien <essiene@gmail.com>2008-12-26 10:29:00 +0100
commita625e7695d9af4083a137821e52bd3afa09c85c2 (patch)
tree11f0aaae33fa1335f1b986f76757b6733d64fe91 /Makefile
parent9e4fdee06474001eecfd58cce1ceea7e49fde9b3 (diff)
parent4be2257979970f5b697d1e4402ca0bd6bd3ae691 (diff)
downloadrabbitmq-server-git-a625e7695d9af4083a137821e52bd3afa09c85c2.tar.gz
Merge in upstream changes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 75e1de7b7a..b441fcabfa 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ TARGETS=$(EBIN_DIR)/rabbit_framing.beam $(patsubst $(SOURCE_DIR)/%.erl, $(EBIN_D
WEB_URL=http://stage.rabbitmq.com/
MANPAGES=$(patsubst %.pod, %.gz, $(wildcard docs/*.[0-9].pod))
+PYTHON=python
+
ifndef USE_SPECS
# our type specs rely on features / bug fixes in dialyzer that are
# only available in R12B-3 upwards
@@ -42,10 +44,10 @@ $(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDE_DIR)/rabbit_framing.hrl $(INCL
# ERLC_EMULATOR="erl -smp" erlc $(ERLC_OPTS) $<
$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH)
- python codegen.py header $(AMQP_SPEC_JSON_PATH) > $@
+ $(PYTHON) codegen.py header $(AMQP_SPEC_JSON_PATH) > $@
$(SOURCE_DIR)/rabbit_framing.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH)
- python codegen.py body $(AMQP_SPEC_JSON_PATH) > $@
+ $(PYTHON) codegen.py body $(AMQP_SPEC_JSON_PATH) > $@
$(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script: $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.rel $(TARGETS)
erl -noshell -eval 'systools:make_script("ebin/rabbit", [{path, ["ebin"]}]), halt().'
@@ -76,10 +78,6 @@ run: all
RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -s rabbit" \
./scripts/rabbitmq-server
-check-mnesia-schema: all
- $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
- ./scripts/rabbitmq-mnesia-current
-
run-node: all
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
@@ -167,7 +165,6 @@ install: all docs_all
cp scripts/rabbitmq-server $(SBIN_DIR)
cp scripts/rabbitmqctl $(SBIN_DIR)
cp scripts/rabbitmq-multi $(SBIN_DIR)
- cp scripts/rabbitmq-mnesia-current $(SBIN_DIR)
for section in 1 5; do \
mkdir -p $(MAN_DIR)/man$$section; \
for manpage in docs/*.$$section.pod; do \