summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-06-17 23:44:25 +0100
committerMatthew Sackman <matthew@lshift.net>2009-06-17 23:44:25 +0100
commitbd121a01a2c12df6ef68a094cdf9407834676947 (patch)
tree05ec1d35b17b5d90d0afe9b4d24f546c3d431bcd /Makefile
parent5b76f375732b0598ae75243ff0642b4cbbb8b919 (diff)
downloadrabbitmq-server-git-bd121a01a2c12df6ef68a094cdf9407834676947.tar.gz
removal of two unused functions from disk_queue. There are two more unused functions which I can't work out what to do about... Also cosmetic
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 367f153aa2..14ed50ff62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
RABBITMQ_NODENAME=rabbit
RABBITMQ_SERVER_START_ARGS=
-RABBITMQ_MNESIA_DIR=/tmp/rabbitmq-$(RABBITMQ_NODENAME)-mnesia
-RABBITMQ_LOG_BASE=/tmp
+RABBITMQ_MNESIA_DIR=~/tmp/rabbitmq-$(RABBITMQ_NODENAME)-mnesia
+RABBITMQ_LOG_BASE=~/tmp
SOURCE_DIR=src
EBIN_DIR=ebin
@@ -94,10 +94,11 @@ run-node: all
run-tests: all
echo "rabbit_tests:all_tests()." | $(ERL_CALL)
-start-background-node:
+start-background-node: stop-node
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
- ./scripts/rabbitmq-server -detached; sleep 1
+ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \
+ ./scripts/rabbitmq-server ; sleep 1
start-rabbit-on-node: all
echo "rabbit:start()." | $(ERL_CALL)
@@ -129,7 +130,7 @@ srcdist: distclean
cp README.in $(TARGET_SRC_DIR)/README
elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \
>> $(TARGET_SRC_DIR)/BUILD
- sed -i.save 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save
+ sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in
cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
cp codegen.py Makefile generate_app $(TARGET_SRC_DIR)