diff options
| author | Marek Majkowski <marek@rabbitmq.com> | 2010-07-14 11:59:13 +0100 |
|---|---|---|
| committer | Marek Majkowski <marek@rabbitmq.com> | 2010-07-14 11:59:13 +0100 |
| commit | 3c753971c2272be4ee93318c003f75133db19535 (patch) | |
| tree | fbb0946fd4e00a57189ef61c7de520d75e984b6c | |
| parent | c765132feb7dabdcb2cd3e30e3ad4150d6f6952c (diff) | |
| parent | 354c3731cfa8fc71d523cfc0753bf9dccbc6fe42 (diff) | |
| download | rabbitmq-server-git-3c753971c2272be4ee93318c003f75133db19535.tar.gz | |
bug22914 merged into defaultrabbitmq_v1_8_1
| -rw-r--r-- | packaging/macports/Makefile | 11 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 4ad4c30b2c..3a22eef08a 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -31,11 +31,18 @@ $(DEST)/Portfile: Portfile.in -f checksums.sed <$^ >$@ rm checksums.sed +# The purpose of the intricate substitution below is to set up similar +# environment vars to the ones that su will on Linux. On OS X, we +# have to use the -m option to su in order to be able to set the shell +# (which for the rabbitmq user would otherwise be /dev/null). But the +# -m option means that *all* environment vars get preserved. Erlang +# needs vars such as HOME to be set. So we have to set them +# explicitly. macports: dirs $(DEST)/Portfile for f in rabbitmq-asroot-script-wrapper rabbitmq-script-wrapper ; do \ cp $(COMMON_DIR)/$$f $(DEST)/files ; \ done - sed -i -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh su -m rabbitmq -c|' \ + 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 cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files if [ -n "$(MACPORTS_USERHOST)" ] ; then \ @@ -52,4 +59,4 @@ macports: dirs $(DEST)/Portfile fi clean: - rm -rf $(DEST) checksums.sed + rm -rf $(MACPORTS_DIR) checksums.sed diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index 188a81c00a..be0d24d75f 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -97,6 +97,8 @@ post-destroot { xinstall -m 555 ${filespath}/rabbitmq-asroot-script-wrapper \ ${wrappersbin}/rabbitmq-activate-plugins + reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \ + ${wrappersbin}/rabbitmq-multi reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \ ${wrappersbin}/rabbitmq-multi reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \ |