diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-04-02 15:00:33 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-04-02 15:00:33 +0100 |
| commit | 81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c (patch) | |
| tree | 9318355f2cec2e8cb1d120dc16934861e8301b38 /packaging | |
| parent | c49f49b27f6309cb768290a753779ce6731c297a (diff) | |
| parent | 85dd778d974c73d70950c773bf8c944d04af0fc2 (diff) | |
| download | rabbitmq-server-git-81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c.tar.gz | |
Merge bug24808.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 4 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index f192575794..234fc2c7d7 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -15,9 +15,11 @@ endif ifeq "$(RPM_OS)" "suse" REQUIRES=/sbin/chkconfig /sbin/service OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse' +START_PROG=setsid else REQUIRES=chkconfig initscripts OS_DEFINES=--define '_initrddir /etc/rc.d/init.d' +START_PROG=runuser rabbitmq --session-command endif rpms: clean server @@ -32,7 +34,7 @@ prepare: cp ${COMMON_DIR}/* SOURCES/ sed -i \ -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ - -e 's|^START_PROG=.*$$|START_PROG="runuser rabbitmq --session-command"|' \ + -e 's|^START_PROG=.*$$|START_PROG="$(START_PROG)"|' \ SOURCES/rabbitmq-server.init ifeq "$(RPM_OS)" "fedora" # Fedora says that only vital services should have Default-Start diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index a910941b6c..1c22216261 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -8,10 +8,7 @@ dist: $(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/rabbitmq-plugins.bat $(SOURCE_DIR)/sbin - mv $(SOURCE_DIR)/scripts/rabbitmqctl.bat $(SOURCE_DIR)/sbin + mv $(SOURCE_DIR)/scripts/*.bat $(SOURCE_DIR)/sbin rm -rf $(SOURCE_DIR)/scripts rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile $(SOURCE_DIR)/*mk rm -f $(SOURCE_DIR)/README |