summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2008-11-27 23:30:38 +0000
committerHubert Plociniczak <hubert@lshift.net>2008-11-27 23:30:38 +0000
commit64cd20da94be05e0ba5a9f2af9441eec4824075a (patch)
treed7fdc61a22fa107728c10974f2169f93ff1054f0
parentdd69094bd1e34c03764c4bc0c4398bdf2dabca7f (diff)
downloadrabbitmq-server-bug19331.tar.gz
Various cosmetic changes to the rabbitmq servicebug19331
-rw-r--r--packaging/windows/Makefile3
-rw-r--r--packaging/windows/rabbitmq-service.pod2
-rwxr-xr-xscripts/rabbitmq-service.bat3
3 files changed, 3 insertions, 5 deletions
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index b052f40a..9d16fd9f 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -2,7 +2,6 @@ VERSION=0.0.0
SOURCE_DIR=rabbitmq-server-$(VERSION)
TARGET_DIR=rabbitmq_server-$(VERSION)
TARGET_ZIP=rabbitmq-server-windows-$(VERSION)
-TOP_DIR=$(shell pwd)
dist:
make -C ../.. VERSION=$(VERSION) srcdist
@@ -20,7 +19,7 @@ dist:
rm -rf $(SOURCE_DIR)/docs
mv $(SOURCE_DIR) $(TARGET_DIR)
- pod2text --loose $(TOP_DIR)/rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt
+ pod2text --loose rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt
unix2dos $(TARGET_DIR)/readme-service.txt
zip -r $(TARGET_ZIP).zip $(TARGET_DIR)
rm -rf $(TARGET_DIR)
diff --git a/packaging/windows/rabbitmq-service.pod b/packaging/windows/rabbitmq-service.pod
index d2ee48f9..6a97c435 100644
--- a/packaging/windows/rabbitmq-service.pod
+++ b/packaging/windows/rabbitmq-service.pod
@@ -21,7 +21,7 @@ By default the service will run in the authentication context of the
local system account. It is therefore necessary to synchronise Erlang
cookies between the local system account (typically
C<C:\WINDOWS\.erlang.cookie> and the account that will be used to
-run B<rabbitctl>.
+run B<rabbitmqctl>.
=head1 COMMANDS
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 5a176726..4b9cc452 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -141,8 +141,7 @@ if errorlevel 1 (
echo %SERVICENAME% service is already present - only updating service parameters
)
-set RABBIT_EBIN_TMP=%~dp0%
-set RABBIT_EBIN=%RABBIT_EBIN_TMP:\=/%../ebin
+set RABBIT_EBIN=%~dp0..\ebin
set ERLANG_SERVICE_ARGUMENTS= ^
-pa "%RABBIT_EBIN%" ^