diff options
| author | Alexander Borisov <alexander.borisov@nginx.com> | 2019-02-22 16:31:44 +0300 |
|---|---|---|
| committer | Alexander Borisov <alexander.borisov@nginx.com> | 2019-02-22 16:31:44 +0300 |
| commit | 608e09e9def182756e2f1650c6f3416b209fbf58 (patch) | |
| tree | b56e435fd0cb36dc2233ee0b843f13f2fcfa9ff1 /pkg/npm | |
| parent | c96b2baca50fe2f5c17f96406e6d741e88267921 (diff) | |
| download | unit-608e09e9def182756e2f1650c6f3416b209fbf58.tar.gz unit-608e09e9def182756e2f1650c6f3416b209fbf58.tar.bz2 | |
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).
Diffstat (limited to 'pkg/npm')
| -rw-r--r-- | pkg/npm/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkg/npm/Makefile b/pkg/npm/Makefile index dfa9ccdc..8636dd0b 100644 --- a/pkg/npm/Makefile +++ b/pkg/npm/Makefile @@ -1,13 +1,9 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version -DEFAULT_VERNUM := $(shell grep 'define NXT_VERNUM' ../../src/nxt_main.h \ - | sed -e 's/[^0-9]//g') - -VERSION ?= $(DEFAULT_VERSION) -VERNUM ?= $(DEFAULT_VERNUM) +VERSION ?= $(NXT_VERSION) +VERNUM ?= $(NXT_VERNUM) NPM ?= npm default: |