Deleting VERSION and extracting it from I3STATUS_VERSION instead (#146)

diff --git a/Makefile b/Makefile
index 379d7c33655371944e557be71d3b7a7f6970c338..440328a60ec11b6b840e014dd21b1743080ffbbc 100644 (file)
--- 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 (file)
index 37989bd..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.10