diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-01-15 14:52:52 +1300 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-01-15 14:52:52 +1300 |
| commit | abe958ccd670441b92771329acf3cd383709215d (patch) | |
| tree | ecc070a5124ae57f548429835fb3b270daa9271c | |
| parent | b506530be5b93d8f39b3fdb7aae2c41592e2025a (diff) | |
| parent | c5933193440dcb6f98172ff51853e1e7ff086cd3 (diff) | |
| download | rabbitmq-server-git-abe958ccd670441b92771329acf3cd383709215d.tar.gz | |
merge default into bug20152
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | generate_app | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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}]). |