summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Powell <steve@rabbitmq.com>2012-02-22 16:36:24 +0000
committerSteve Powell <steve@rabbitmq.com>2012-02-22 16:36:24 +0000
commitc5f162cafd84975e81528aaec762bfe5a6c81557 (patch)
tree95d9f371dd8291a3cae3db68e4b0b6e4abc95fee
parent237635a4b6590dee79137d9c18732bd097b88c5a (diff)
downloadrabbitmq-server-c5f162cafd84975e81528aaec762bfe5a6c81557.tar.gz
Put back one sed change -- not an inline update after all.
-rw-r--r--packaging/macports/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile
index 4c146813..897fc183 100644
--- a/packaging/macports/Makefile
+++ b/packaging/macports/Makefile
@@ -38,8 +38,8 @@ $(DEST)/Portfile: Portfile.in
# needs vars such as HOME to be set. So we have to set them
# explicitly.
macports: dirs $(DEST)/Portfile
- sed -i -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$$(eval `PATH=MACPORTS_PREFIX/bin /usr/libexec/path_helper -s`; echo $$PATH)" su -m rabbitmq -c|' \
- $(DEST)/files/rabbitmq-script-wrapper
+ sed -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$$(eval `PATH=@MACPORTS_PREFIX@/bin /usr/libexec/path_helper -s`; echo $$PATH)" su -m rabbitmq -c|' \
+ $(COMMON_DIR)/rabbitmq-script-wrapper >$(DEST)/files/rabbitmq-script-wrapper
cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files
if [ -n "$(MACPORTS_USERHOST)" ] ; then \
tar cf - -C $(MACPORTS_DIR) . | ssh $(SSH_OPTS) $(MACPORTS_USERHOST) ' \