diff options
| author | James Cammarata <jimi@sngx.net> | 2015-04-07 09:54:19 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-04-07 09:54:19 -0500 |
| commit | 1cf911d5244bc15640823bfa59acd08c421d7940 (patch) | |
| tree | f275f5b6cabcc3f021303497c92d6eaee8e277f8 /Makefile | |
| parent | b8a9d87f30c86b7737b3cf63c4de67fd8547ce0e (diff) | |
| download | ansible-1cf911d5244bc15640823bfa59acd08c421d7940.tar.gz | |
Back-porting Makefile changes for version/release
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -34,7 +34,8 @@ PYTHON=python SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") # VERSION file provides one place to update the software version -VERSION := $(shell cat VERSION) +VERSION := $(shell cat VERSION | cut -f1 -d' ') +RELEASE := $(shell cat VERSION | cut -f2 -d' ') # Get the branch information from git ifneq ($(shell which git),) @@ -53,7 +54,7 @@ DEBUILD_OPTS = --source-option="-I" DPUT_BIN ?= dput DPUT_OPTS ?= ifeq ($(OFFICIAL),yes) - DEB_RELEASE = 1ppa + DEB_RELEASE = $(RELEASE)ppa # Sign OFFICIAL builds using 'DEBSIGN_KEYID' # DEBSIGN_KEYID is required when signing ifneq ($(DEBSIGN_KEYID),) @@ -74,7 +75,7 @@ DEB_DIST ?= unstable RPMSPECDIR= packaging/rpm RPMSPEC = $(RPMSPECDIR)/ansible.spec RPMDIST = $(shell rpm --eval '%{?dist}') -RPMRELEASE = 1 +RPMRELEASE = $(RELEASE) ifneq ($(OFFICIAL),yes) RPMRELEASE = 0.git$(DATE) endif |