diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2009-10-05 15:31:53 +0100 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2009-10-05 15:31:53 +0100 |
| commit | e205a1f1873b19f9dfb4ec934da1b4ee91e461a2 (patch) | |
| tree | 25f878eaf5a22fd1983a48cb09002a70ea631ab5 /packaging/windows | |
| parent | 88d5f01b0241679fed1b1032dfde1d4760eaeb9d (diff) | |
| parent | 1ff98eb5204ee7edda8b85d74667e3d31e4bc5ac (diff) | |
| download | rabbitmq-server-git-e205a1f1873b19f9dfb4ec934da1b4ee91e461a2.tar.gz | |
Merge from default. Resolved some conflicts due to bool->boolean in
type specs, and a bad automerge in rabbit_reader.erl.
Diffstat (limited to 'packaging/windows')
| -rw-r--r-- | packaging/windows/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index 59101cb2c6..f17fe77742 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -4,15 +4,17 @@ TARGET_DIR=rabbitmq_server-$(VERSION) TARGET_ZIP=rabbitmq-server-windows-$(VERSION) dist: - make -C ../.. VERSION=$(VERSION) srcdist + $(MAKE) -C ../.. VERSION=$(VERSION) srcdist tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz - make -C $(SOURCE_DIR) + $(MAKE) -C $(SOURCE_DIR) mkdir $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/rabbitmq-server.bat $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/rabbitmq-service.bat $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/rabbitmqctl.bat $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/rabbitmq-multi.bat $(SOURCE_DIR)/sbin + mv $(SOURCE_DIR)/scripts/rabbitmq-activate-plugins.bat $(SOURCE_DIR)/sbin + mv $(SOURCE_DIR)/scripts/rabbitmq-deactivate-plugins.bat $(SOURCE_DIR)/sbin rm -rf $(SOURCE_DIR)/scripts rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile rm -f $(SOURCE_DIR)/README |