From 608e09e9def182756e2f1650c6f3416b209fbf58 Mon Sep 17 00:00:00 2001 From: Alexander Borisov Date: Fri, 22 Feb 2019 16:31:44 +0300 Subject: Improvement and unification of version processing in build scripts. This also eliminates expressions that incompatible with BSD make, thus fixing installation of Node.js module on FreeBSD (broken by dace60fc4926). --- pkg/docker/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/docker/Makefile') diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 140ac5b3..cf6de78d 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -1,10 +1,10 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version + DEFAULT_RELEASE := 1 -VERSION ?= $(DEFAULT_VERSION) +VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) CODENAME := stretch -- cgit