diff options
| author | Paul Jones <paulj@lshift.net> | 2009-07-29 13:12:34 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-07-29 13:12:34 +0100 |
| commit | 4bedf0ea86889fcdb46d34fe777febcb77ec68c1 (patch) | |
| tree | 11a05a0e321fee86b72a34454e52c038adce2e09 | |
| parent | 6cdd1a508bbf886cf700fd7ba430e5fc68133604 (diff) | |
| download | rabbitmq-server-git-4bedf0ea86889fcdb46d34fe777febcb77ec68c1.tar.gz | |
Fixed lib locations and root wrapper mutation in macports
| -rw-r--r-- | packaging/macports/net/rabbitmq-server/Portfile | 6 | ||||
| -rw-r--r-- | packaging/macports/net/rabbitmq-server/files/rabbitmq-asroot-script-wrapper | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile index b406b6dbfb..1826d5c415 100644 --- a/packaging/macports/net/rabbitmq-server/Portfile +++ b/packaging/macports/net/rabbitmq-server/Portfile @@ -42,7 +42,7 @@ use_parallel_build yes build.args PYTHON=${prefix}/bin/python2.5 destroot.destdir \ - TARGET_DIR=${destroot}${prefix}/rabbitmq/erlang/lib/rabbitmq_server-${version} \ + TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \ SBIN_DIR=${sbindir} \ MAN_DIR=${destroot}${prefix}/share/man @@ -88,6 +88,10 @@ post-destroot { ${wrappersbin}/rabbitmq-multi reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \ ${wrappersbin}/rabbitmq-multi + reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \ + ${wrappersbin}/rabbitmq-activate-plugins + reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \ + ${wrappersbin}/rabbitmq-activate-plugins file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl } diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-asroot-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-asroot-script-wrapper index 5e3387ef9d..c4488dcbe5 100644 --- a/packaging/macports/net/rabbitmq-server/files/rabbitmq-asroot-script-wrapper +++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-asroot-script-wrapper @@ -6,7 +6,6 @@ SCRIPT=`basename $0` if [ `id -u` = 0 ] ; then /usr/lib/rabbitmq/bin/${SCRIPT} "$@" else - /usr/lib/rabbitmq/bin/${SCRIPT} echo -e "\nOnly root should run ${SCRIPT}\n" exit 1 fi |