From 629d418a837f903b63f1ad30c31197cc208f7bae Mon Sep 17 00:00:00 2001 From: Andreas Stenius Date: Sun, 21 Dec 2014 22:58:56 +0100 Subject: Update version when building erlang.mk. --- Makefile | 4 +++- erlang.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d7bb08d..300fb2c 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,13 @@ BUILD_CONFIG_FILE ?= $(CURDIR)/build.config BUILD_CONFIG = $(shell sed "s/\#.*//" $(BUILD_CONFIG_FILE)) ERLANG_MK = erlang.mk +ERLANG_MK_VERSION = $(shell git describe --tags --dirty) .PHONY: all all: pkg - awk 'FNR==1 && NR!=1{print ""}1' $(patsubst %,%.mk,$(BUILD_CONFIG)) > $(ERLANG_MK) + awk 'FNR==1 && NR!=1{print ""}1' $(patsubst %,%.mk,$(BUILD_CONFIG)) \ + | sed 's/^ERLANG_MK_VERSION = .*/ERLANG_MK_VERSION = $(ERLANG_MK_VERSION)/' > $(ERLANG_MK) pkg: cat packages.v2.tsv | awk 'BEGIN { FS = "\t" }; { print $$1 "\t" $$3 "\t" $$5 "\t" $$6 }' > packages.v1.tsv diff --git a/erlang.mk b/erlang.mk index b9be16a..ddf468e 100644 --- a/erlang.mk +++ b/erlang.mk @@ -14,7 +14,7 @@ .PHONY: all deps app rel docs tests clean distclean help erlang-mk -ERLANG_MK_VERSION = 1 +ERLANG_MK_VERSION = 1.2.0-37-g5fef667-dirty # Core configuration. -- cgit v1.2.3