diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 3 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 1 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 3 |
4 files changed, 6 insertions, 3 deletions
@@ -58,7 +58,7 @@ ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_m VERSION=0.0.0 PLUGINS_SRC_DIR= -PLUGINS_DIST_DIR=provided_plugins +PLUGINS_DIST_DIR?=provided_plugins TARBALL_NAME=rabbitmq-server-$(VERSION) TARGET_SRC_DIR=dist/$(TARBALL_NAME) diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index c67d8fd6e1..cd63109ff7 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -2,6 +2,7 @@ TARBALL_DIR=../../../dist TARBALL=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz)) COMMON_DIR=../../common VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g') +PLUGINS_DIST_DIR= TOP_DIR=$(shell pwd) #Under debian we do not want to check build dependencies, since that @@ -43,7 +44,7 @@ endif cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare - rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) + PLUGINS_DIST_DIR=$(PLUGINS_DIST_DIR) rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) clean: rm -rf SOURCES SPECS RPMS SRPMS BUILD tmp diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 815b8cde8b..b3ebb9e281 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -30,6 +30,7 @@ scalable implementation of an AMQP broker. %define _rabbit_wrapper %{_builddir}/`basename %{S:2}` %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}` %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins +%define _provided_plugins_dir %{_localstatedir}/lib/rabbitmq/provided_plugins %define _maindir %{buildroot}%{_rabbit_erllibdir} diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 38c81134a2..956cc60242 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -2,6 +2,7 @@ TARBALL_DIR=../../../dist TARBALL=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz)) COMMON_DIR=../../common VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g') +PLUGINS_DIST_DIR= DEBIAN_ORIG_TARBALL=$(shell echo $(TARBALL) | sed -e 's:\(.*\)-\(.*\)\(\.tar\.gz\):\1_\2\.orig\3:g') UNPACKED_DIR=rabbitmq-server-$(VERSION) @@ -33,7 +34,7 @@ package: clean $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) - cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) + cd $(UNPACKED_DIR); PLUGINS_DIST_DIR=$(PLUGINS_DIST_DIR) GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) clean: |