From 535fc76fb307a8894c0a9e2404d0ea8bb892dbf0 Mon Sep 17 00:00:00 2001 From: eplanet Date: Sat, 13 Aug 2016 22:46:31 +0200 Subject: Deleting VERSION and extracting it from I3STATUS_VERSION instead (#146) --- Makefile | 4 ++-- VERSION | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 VERSION diff --git a/Makefile b/Makefile index 379d7c3..440328a 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ LIBS+=-lpthread ifeq ($(wildcard .git),) # not in git repository - VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)' - I3STATUS_VERSION := '$(shell [ -f $(TOPDIR)/I3STATUS_VERSION ] && cat $(TOPDIR)/I3STATUS_VERSION)' + VERSION := $(shell [ -f $(TOPDIR)/I3STATUS_VERSION ] && cat $(TOPDIR)/I3STATUS_VERSION | cut -d '-' -f 1) + I3STATUS_VERSION := $(shell [ -f $(TOPDIR)/I3STATUS_VERSION ] && cat $(TOPDIR)/I3STATUS_VERSION) else VERSION:=$(shell git describe --tags --abbrev=0) I3STATUS_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" diff --git a/VERSION b/VERSION deleted file mode 100644 index 37989bd..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.10 -- cgit v1.2.3