merge from bug 21397

Matthew Sackman · Matthew Sackman · commit b35f6b0ee9fe · 2009-09-30T17:49:15.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,11 +1,10 @@
-ifndef TMPDIR
-TMPDIR := /tmp
-endif
 
-RABBITMQ_NODENAME=rabbit
-RABBITMQ_SERVER_START_ARGS=
-RABBITMQ_MNESIA_DIR=$(TMPDIR)/rabbitmq-$(RABBITMQ_NODENAME)-mnesia
-RABBITMQ_LOG_BASE=$(TMPDIR)
+TMPDIR ?= /tmp
+
+RABBITMQ_NODENAME ?= rabbit
+RABBITMQ_SERVER_START_ARGS ?=
+RABBITMQ_MNESIA_DIR ?= $(TMPDIR)/rabbitmq-$(RABBITMQ_NODENAME)-mnesia
+RABBITMQ_LOG_BASE ?= $(TMPDIR)
 
 SOURCE_DIR=src
 EBIN_DIR=ebin
