X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=3084ae7ddfa67dbea4eb9399909a84b95a9fcc4e;hb=27952b11f736a7dc1fb4e27a1251481d4f71c751;hp=379d7c33655371944e557be71d3b7a7f6970c338;hpb=4a37333cadcd049569148ce2b0ed56c37609b401;p=i3%2Fi3status

diff --git a/Makefile b/Makefile
index 379d7c3..3084ae7 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ LIBS+=-lpthread
 
 ifeq ($(wildcard .git),)
   # not in git repository
-  VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/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)
@@ -76,7 +76,7 @@ CFLAGS+=$(EXTRA_CFLAGS)
 # YAJL_MAJOR from that file to decide which code path should be used.
 CFLAGS += -idirafter yajl-fallback
 
-OBJS:=$(wildcard src/*.c *.c)
+OBJS:=$(sort $(wildcard src/*.c *.c))
 OBJS:=$(OBJS:.c=.o)
 
 ifeq ($(OS),OpenBSD)
@@ -128,6 +128,6 @@ release:
 	cp -r include i3status-${VERSION}
 	cp -r yajl-fallback i3status-${VERSION}
 	cp -r contrib i3status-${VERSION}
-	sed -e 's/^I3STATUS_VERSION:=\(.*\)/I3STATUS_VERSION=${I3STATUS_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
+	echo ${I3STATUS_VERSION} > i3status-${VERSION}/I3STATUS_VERSION
 	tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
 	rm -rf i3status-${VERSION}