2 files changed, 11 insertions, 15 deletions
diff --git a/packaging/generic-unix/rabbitmq-sys b/packaging/generic-unix/rabbitmq-sys
index efd2076674..3151c979b7 100644
--- a/packaging/generic-unix/rabbitmq-sys
+++ b/packaging/generic-unix/rabbitmq-sys
@@ -16,17 +16,19 @@
 ##
 
 ### generic-unix ###
+### next line potentially updated in package install steps, do not alter
+SYS_PREFIX=${RABBITMQ_HOME}
 
 ## Set system default values
 SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
 -kernel inet_default_connect_options [{nodelay,true}]"
 
-CONFIG_FILE=${RABBITMQ_HOME}/rabbitmq
+CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
+LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
+MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
+ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
 
-LOG_BASE=${RABBITMQ_HOME}/log
+OLD_CONF_ENV_FILE=${CONFIG_FILE}.conf
+CONF_ENV_FILE=${CONFIG_FILE}-env.conf
 
-MNESIA_BASE=${RABBITMQ_HOME}/mnesia
-
-PLUGINS_DIR=${RABBITMQ_HOME}/plugins
-
-ENABLED_PLUGINS_FILE=${RABBITMQ_HOME}/enabled_plugins
+PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 360fb394eb..9ab64eafdf 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -87,14 +87,8 @@ post-destroot {
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
-    reinplace -E "s:(/etc/rabbitmq/rabbitmq):${prefix}\\1:g" \
-        ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE ENABLED_PLUGINS_FILE} {
-        reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
-            ${realsbin}/rabbitmq-server \
-            ${realsbin}/rabbitmqctl \
-            ${realsbin}/rabbitmq-plugins
-    }
+    reinplace -E 's:^SYS_PREFIX=${RABBITMQ_HOME}$:SYS_PREFIX='"${prefix}"':' \
+        ${realsbin}/rabbitmq-sys \
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-server