diff options
| author | David Wragg <dpw@lshift.net> | 2009-08-20 13:58:22 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-08-20 13:58:22 +0100 |
| commit | dd56a8132e6076e8690e5cb1fba2da567fbb2997 (patch) | |
| tree | 27440ae83e18a3f9e126349f1e9a35d833a43e7a /packaging/windows | |
| parent | 5f3ee0a97a30a9dcd06d16efcab53716b52949c8 (diff) | |
| parent | 49157676d8179402e9474e80ed25e8aa6f95087c (diff) | |
| download | rabbitmq-server-git-dd56a8132e6076e8690e5cb1fba2da567fbb2997.tar.gz | |
Merge default into bug19973, resolving conflict
Diffstat (limited to 'packaging/windows')
| -rw-r--r-- | packaging/windows/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index 59101cb2c6..28f7931907 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -13,6 +13,7 @@ dist: 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 rm -rf $(SOURCE_DIR)/scripts rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile rm -f $(SOURCE_DIR)/README |