diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-04-24 17:01:05 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-04-24 17:01:05 +0100 |
| commit | e671dde6ac5f9719e34f88e64658739bd6ef4237 (patch) | |
| tree | 388a1774d529fdbf958c514bcc96aa8aae3b37ac /Makefile | |
| parent | 8166ccce9ec26136743f8be22792d693b0f3f45d (diff) | |
| parent | a337febda4a68311750553a969d932e1e277e946 (diff) | |
| download | rabbitmq-server-git-e671dde6ac5f9719e34f88e64658739bd6ef4237.tar.gz | |
merge default into amqp_0_9_1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -94,11 +94,10 @@ run-node: all run-tests: all echo "rabbit_tests:all_tests()." | $(ERL_CALL) -start-background-node: stop-node +start-background-node: $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ - RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ - ./scripts/rabbitmq-server ; sleep 1 + ./scripts/rabbitmq-server -detached; sleep 1 start-rabbit-on-node: all echo "rabbit:start()." | $(ERL_CALL) @@ -130,7 +129,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 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in + sed -i.save 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/ cp codegen.py Makefile generate_app $(TARGET_SRC_DIR) |