summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-01-15 01:31:39 +0000
committerMatthias Radestock <matthias@lshift.net>2009-01-15 01:31:39 +0000
commitc5933193440dcb6f98172ff51853e1e7ff086cd3 (patch)
tree64b83f5b13f3411a45c4929c22e047f4fce9df43
parent26e0b857593d1375ae30d4a63a6fbf2acd2e0560 (diff)
parent833b197ff5a2e9642927909c7fa6863f863cb6b7 (diff)
downloadrabbitmq-server-git-c5933193440dcb6f98172ff51853e1e7ff086cd3.tar.gz
merge bug20155 into default
-rw-r--r--Makefile2
-rw-r--r--generate_app2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e75f2d28d1..cc070d9f7e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
#all: $(EBIN_DIR)/rabbit.boot
all: $(TARGETS)
-$(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS)
+$(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
escript generate_app $(EBIN_DIR) < $< > $@
$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDE_DIR)/rabbit_framing.hrl $(INCLUDE_DIR)/rabbit.hrl
diff --git a/generate_app b/generate_app
index bb6f751613..623012927e 100644
--- a/generate_app
+++ b/generate_app
@@ -4,7 +4,7 @@
main([BeamDir]) ->
Modules = [list_to_atom(filename:basename(F, ".beam")) ||
F <- filelib:wildcard("*.beam", BeamDir)],
- {ok, {application, Application, Properties}} = io:read(""),
+ {ok, {application, Application, Properties}} = io:read(''),
NewProperties = lists:keyreplace(modules, 1, Properties,
{modules, Modules}),
io:format("~p.", [{application, Application, NewProperties}]).