diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-04-25 13:35:02 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-04-25 13:35:02 +0100 |
| commit | 3d6fda6a6d20fb4de1f7e248e02561000b9101ef (patch) | |
| tree | 413a91fdfb657561f1dd391119b4df715e499a29 | |
| parent | 9ceb8aced6dbca5655516f2146fe60da38d7c1a7 (diff) | |
| download | rabbitmq-server-git-3d6fda6a6d20fb4de1f7e248e02561000b9101ef.tar.gz | |
One less substitution. Pity RHEL and SUSE also differ gratuitously.
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 1 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.init | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 13996f9bef..180500ed38 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -34,7 +34,6 @@ prepare: cp ${COMMON_DIR}/* SOURCES/ cp rabbitmq-server.init SOURCES/rabbitmq-server.init sed -i \ - -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ -e 's|^START_PROG=.*$$|START_PROG="$(START_PROG)"|' \ SOURCES/rabbitmq-server.init ifeq "$(RPM_OS)" "fedora" diff --git a/packaging/RPMS/Fedora/rabbitmq-server.init b/packaging/RPMS/Fedora/rabbitmq-server.init index 40238c8e38..2d2680e3b2 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.init +++ b/packaging/RPMS/Fedora/rabbitmq-server.init @@ -27,7 +27,7 @@ INIT_LOG_DIR=/var/log/rabbitmq PID_FILE=/var/run/rabbitmq/pid START_PROG= # Set when building package -LOCK_FILE= # Set when building package +LOCK_FILE=/var/lock/subsys/$NAME test -x $DAEMON || exit 0 test -x $CONTROL || exit 0 |