diff options
| -rw-r--r-- | packaging/Makefile | 42 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 3 |
2 files changed, 14 insertions, 31 deletions
diff --git a/packaging/Makefile b/packaging/Makefile index edb876770f..0786e8c11a 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -60,55 +60,39 @@ ifndef NO_CLEAN DO_CLEAN := clean endif +VARS = SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ + PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ + SIGNING_KEY=$(SIGNING_KEY) \ + SIGNING_USER_ID=$(SIGNING_USER_ID) \ + SIGNING_USER_EMAIL=$(SIGNING_USER_EMAIL) + packages: package-deb package-rpm package-windows package-generic-unix @: package-deb: $(SOURCE_DIST_FILE) - $(gen_verbose) $(MAKE) -C debs/Debian \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - all $(DO_CLEAN) + $(gen_verbose) $(MAKE) -C debs/Debian $(VARS) all $(DO_CLEAN) package-rpm: package-rpm-fedora package-rpm-suse @: package-rpm-fedora: $(SOURCE_DIST_FILE) - $(gen_verbose) $(MAKE) -C RPMS/Fedora \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - all $(DO_CLEAN) + $(gen_verbose) $(MAKE) -C RPMS/Fedora $(VARS) all $(DO_CLEAN) package-rpm-suse: $(SOURCE_DIST_FILE) - $(gen_verbose) $(MAKE) -C RPMS/Fedora \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - RPM_OS=suse \ - all $(DO_CLEAN) + $(gen_verbose) $(MAKE) -C RPMS/Fedora $(VARS) RPM_OS=suse all $(DO_CLEAN) package-windows: $(SOURCE_DIST_FILE) - $(gen_verbose) $(MAKE) -C windows \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - all $(DO_CLEAN) - $(verbose) $(MAKE) -C windows-exe \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - all $(DO_CLEAN) + $(gen_verbose) $(MAKE) -C windows $(VARS) all $(DO_CLEAN) + $(verbose) $(MAKE) -C windows-exe $(VARS) all $(DO_CLEAN) package-generic-unix: $(SOURCE_DIST_FILE) - $(gen_verbose) $(MAKE) -C generic-unix \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - all $(DO_CLEAN) + $(gen_verbose) $(MAKE) -C generic-unix $(VARS) all $(DO_CLEAN) ifeq ($(PLATFORM),darwin) packages: package-standalone-macosx package-standalone-macosx: $(SOURCE_DIST_FILE) - $(gen_verbose) $(MAKE) -C standalone OS=mac \ - SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \ - PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \ - all $(DO_CLEAN) + $(gen_verbose) $(MAKE) -C standalone $(VARS) OS=mac all $(DO_CLEAN) endif .PHONY: clean diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index a35b869d4f..8a39288b38 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -17,12 +17,11 @@ endif DEBIAN_ORIG_TARBALL = rabbitmq-server_$(VERSION).orig.tar.xz UNPACKED_DIR = rabbitmq-server-$(VERSION) PACKAGENAME = rabbitmq-server -SIGNING_KEY_ID = 056E8E56 ifneq "$(UNOFFICIAL_RELEASE)" "" SIGNING=-us -uc else - SIGNING=-k$(SIGNING_KEY_ID) + SIGNING=-k$(SIGNING_KEY) endif unexport DEPS_DIR |