diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-10 11:29:23 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-10 11:29:23 +0000 |
| commit | bd5da6d7b1cce23946640226f8b7e72fb4beda94 (patch) | |
| tree | f0b9d65a8495a7c54756ebfcc538a37edab2101d | |
| parent | 3348bb6bd6bf04ba995224fb2e84e7b50bb9062c (diff) | |
| download | rabbitmq-server-bd5da6d7b1cce23946640226f8b7e72fb4beda94.tar.gz | |
Simplify macports Makefile and delimit MACPORTS_PREFIX in the usual way.
| -rw-r--r-- | packaging/macports/Makefile | 6 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 23864a03..897fc183 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -38,10 +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 - cp $(COMMON_DIR)/rabbitmq-script-wrapper $(DEST)/files - 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|' \ - $(DEST)/files/rabbitmq-script-wrapper >$(DEST)/files/rabbitmq-script-wrapper.tmp \ - && mv $(DEST)/files/rabbitmq-script-wrapper.tmp $(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) ' \ diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index 8860147a..72b476c0 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -92,7 +92,7 @@ post-destroot { xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \ ${wrappersbin}/rabbitmq-server - reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:g" \ + reinplace -E "s:@MACPORTS_PREFIX@:${prefix}:g" \ ${wrappersbin}/rabbitmq-server reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:g" \ ${wrappersbin}/rabbitmq-server |