From c93312651d40092e4d85a6a00d65cdd4774cdf10 Mon Sep 17 00:00:00 2001
From: Matthew Sackman <matthew@lshift.net>
Date: Sun, 21 Mar 2010 19:19:25 +0000
Subject: All module names must start 'rabbit_'.

---
 Makefile               | 2 +-
 src/rabbit_control.erl | 2 +-
 src/rabbit_multi.erl   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9f47005d..ee51ef30 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
 ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
 
 define usage_xml_to_erl
-  $(patsubst $(DOCS_DIR)/%.1.xml, $(SOURCE_DIR)/%_usage.erl, $(subst -,_,$(1)))
+  $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, $(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1))))
 endef
 
 define usage_dep
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 6f564b1d..3ba150cb 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -130,7 +130,7 @@ stop() ->
     ok.
 
 usage() -> 
-    rabbitmqctl_usage:usage().
+    rabbit_ctl_usage:usage().
 
 action(stop, Node, [], Inform) ->
     Inform("Stopping and halting node ~p", [Node]),
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index d9ee6d32..7b09a91d 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -86,7 +86,7 @@ stop() ->
     ok.
 
 usage() -> 
-    rabbitmq_multi_usage:usage().
+    rabbit_multi_usage:usage().
 
 action(start_all, [NodeCount], RpcTimeout) ->
     io:format("Starting all nodes...~n", []),
-- 
cgit v1.2.1