diff options
| author | Andrei Belov <defan@nginx.com> | 2020-12-24 16:17:27 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2020-12-24 16:17:27 +0300 |
| commit | c981ac6558440f42670fc0a3d3857a3bb10e1f0a (patch) | |
| tree | b2d808953f438951b0d736214b52766b76a01171 | |
| parent | c369e25ae7e3de7759c5950a2a84870cc1a8401f (diff) | |
| download | unit-c981ac6558440f42670fc0a3d3857a3bb10e1f0a.tar.gz unit-c981ac6558440f42670fc0a3d3857a3bb10e1f0a.tar.bz2 | |
Packages: fixed an ability to override package version.
This was broken since 00d8049418cf.
| -rw-r--r-- | pkg/deb/Makefile | 3 | ||||
| -rw-r--r-- | pkg/docker/Makefile | 3 | ||||
| -rw-r--r-- | pkg/rpm/Makefile | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 80898a8f..16e73b94 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -2,9 +2,10 @@ include ../../version +DEFAULT_VERSION := $(NXT_VERSION) DEFAULT_RELEASE := 1 -VERSION ?= $(NXT_VERSION) +VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) SRCDIR= unit-$(VERSION) diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 3b6c2720..455e9fb1 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -3,9 +3,10 @@ include ../../version include ../shasum.mak +DEFAULT_VERSION := $(NXT_VERSION) DEFAULT_RELEASE := 1 -VERSION ?= $(NXT_VERSION) +VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) CODENAME := buster diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 80418149..285e0857 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -2,9 +2,10 @@ include ../../version +DEFAULT_VERSION := $(NXT_VERSION) DEFAULT_RELEASE := 1 -VERSION ?= $(NXT_VERSION) +VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) |