diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2018-06-27 18:30:49 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2018-06-27 18:30:49 +0300 |
| commit | 42e1d8e3b2705b60e3aee900579d569e9fa44300 (patch) | |
| tree | 9333ad6a0ec1550b7cb13d0a1b8ebb44eaa6e703 | |
| parent | 606eda045bc3608977648fb1de61d8e328984d30 (diff) | |
| download | unit-42e1d8e3b2705b60e3aee900579d569e9fa44300.tar.gz unit-42e1d8e3b2705b60e3aee900579d569e9fa44300.tar.bz2 | |
Packages: tar building functionality moved into pkg/Makefile.
| -rw-r--r-- | auto/make | 12 | ||||
| -rw-r--r-- | pkg/Makefile | 9 |
2 files changed, 8 insertions, 13 deletions
@@ -224,16 +224,11 @@ ${NXT_DAEMON}-uninstall: END -nxt_version=`grep 'define NXT_VERSION' src/nxt_main.h \ - | sed -e 's/.*"\(.*\)".*/\1/'` - # Makefile. # *.dSYM is MacOSX Clang debug information. cat << END > Makefile -NXT_VERSION = $nxt_version - include $NXT_MAKEFILE .PHONY: tests @@ -243,11 +238,4 @@ tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test clean: rm -rf $NXT_BUILD_DIR *.dSYM Makefile -.PHONY: dist -dist: - rm -f unit-\$(NXT_VERSION).tar.gz - hg archive unit-\$(NXT_VERSION).tar.gz \\ - -p unit-\$(NXT_VERSION) \\ - -X ".hg*" -X "pkg/" -X "docs/" - END diff --git a/pkg/Makefile b/pkg/Makefile index 5b0a9e97..f5cfd3c2 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -6,7 +6,14 @@ VERSION ?= $(shell grep 'define NXT_VERSION' ../src/nxt_main.h \ RELEASE ?= 1 default: - @echo "available targets: rpm deb docker" + @echo "available targets: dist rpm deb docker" + +dist: + rm -f unit-$(VERSION).tar.gz + hg archive unit-$(VERSION).tar.gz \ + -r $(VERSION) \ + -p unit-$(VERSION) \ + -X "../.hg*" -X "../pkg/" -X "../docs/" rpm: @cd rpm && VERSION=$(VERSION) RELEASE=$(RELEASE) make all |