diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/generic-unix/Makefile | 7 | ||||
| -rw-r--r-- | packaging/macports/Makefile | 5 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 12 |
3 files changed, 14 insertions, 10 deletions
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index b5c342aad7..b6ef9532ef 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -12,6 +12,13 @@ dist: MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ install + sed -e 's:^SYS_PREFIX=$$:SYS_PREFIX=\$${RABBITMQ_HOME}:' \ + $(TARGET_DIR)/sbin/rabbitmq-defaults >$(TARGET_DIR)/sbin/rabbitmq-defaults.tmp \ + && mv $(TARGET_DIR)/sbin/rabbitmq-defaults.tmp $(TARGET_DIR)/sbin/rabbitmq-defaults + chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-defaults + + mkdir -p $(TARGET_DIR)/etc/rabbitmq + tar -zcf $(TARGET_TARBALL).tar.gz $(TARGET_DIR) rm -rf $(SOURCE_DIR) $(TARGET_DIR) diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 47da02dcf9..897fc18327 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -38,9 +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 -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) ' \ diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index cde02b1aa9..e461e49eca 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -90,16 +90,14 @@ 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-env - } + reinplace -E "s:^SYS_PREFIX=\${RABBITMQ_HOME}$:SYS_PREFIX=${prefix}:" \ + ${realsbin}/rabbitmq-defaults + reinplace -E "s:^SYS_PREFIX=$:SYS_PREFIX=${prefix}:" \ + ${realsbin}/rabbitmq-defaults 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 |