summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authoreplanet <emeric.planet@gmail.com>2016-08-13 22:46:31 +0200
committerMichael Stapelberg <stapelberg@users.noreply.github.com>2016-08-13 13:46:31 -0700
commit535fc76fb307a8894c0a9e2404d0ea8bb892dbf0 (patch)
tree6a977ddaffc1fc5efe5ebecef898e9024133ddae /Makefile
parent2d16f144f59587ab6770d4ed30f1de92f6e81478 (diff)
Deleting VERSION and extracting it from I3STATUS_VERSION instead (#146)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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))"