diff --git a/pkg/Makefile.deb b/pkg/Makefile.deb index 7581246..cde8eda 100644 --- a/pkg/Makefile.deb +++ b/pkg/Makefile.deb @@ -6,9 +6,9 @@ export CL_BASE = $(DEB_BUILD_ROOT)/opt/aerospike export ETC_BASE = $(DEB_BUILD_ROOT)/etc/aerospike -#REV = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) DIR_PKG = target/packages -REV = $(shell build/version) +REV = $(shell grep VERSION src/common/version.h | tr -s ' ' | cut -d' ' -f3 | tr -d '"') +BLD_ID = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) OS = $(shell build/os_version) ARCH=$(shell uname -m) MANIFEST_DIR = manifest/TEMP diff --git a/pkg/Makefile.rpm b/pkg/Makefile.rpm index c669303..341ac28 100644 --- a/pkg/Makefile.rpm +++ b/pkg/Makefile.rpm @@ -7,8 +7,8 @@ export ETC_BASE = $(RPM_BUILD_ROOT)/etc/aerospike MANIFEST_DIR = manifest/TEMP DIR_PKG = target/packages -#REV = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) -REV = $(shell build/version) +REV = $(shell grep VERSION src/common/version.h | tr -s ' ' | cut -d' ' -f3 | tr -d '"') +BLD_ID = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) OS = $(shell build/os_version) ARCH=$(shell uname -m)