From 341ca6c96dfb903ea6bf3202a9656b1ebb02fb45 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 8 Jul 2010 11:51:10 +0000 Subject: [PATCH] defs.mk: Add support for optional VERSION file in working directory --- make/defs.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 74818170..d410c377 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -36,8 +36,9 @@ PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g PROJECT_DESCR ?= No description CUSTOMER ?= jannet -VERSION ?= $(shell cat $(TOPDIR)/VERSION) -DIST_VERSION ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION) +VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION)) +VERSION ?= $(shell cat $(VERSION_FILE)) +DIST_VERSION ?= $(shell sed -e "s/-dev//" $(VERSION_FILE)) HEX_VERSION = $(shell echo $(DIST_VERSION) | \ sed 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x") BINARY_VERSION = $(shell echo $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | sed 's/-[^-]*$$//; s/-/_/g')