disk: sanitize trailing slashes

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 440328a60ec11b6b840e014dd21b1743080ffbbc..3084ae7ddfa67dbea4eb9399909a84b95a9fcc4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ LIBS+=-lpthread
 ifeq ($(wildcard .git),)
   # not in git repository
   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)
+  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))"
@@ -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}