i3lock-color

Index Commits Files Refs README LICENSE

commit a0abccf8f362c864b4e46251684bf9c2c33ce168
parent 90c24c3a2862534d583b4d7a03326f1df22e8bf4
Author: Michael Stapelberg <michael@stapelberg.de>
Date:   Sun, 18 Jun 2017 17:56:05 +0200

Makefile: fix I3LOCK_VERSION replacement

fixes #129

Diffstat:
M
Makefile
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ FILES:=$(FILES:.c=.o)
 ifeq ($(wildcard .git),)
   # not in git repository
   VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1)
-  I3LOCK_VERSION := '$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)'
+  I3LOCK_VERSION:='$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)'
 else
   VERSION:=$(shell git describe --tags --abbrev=0)
   I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
@@ -62,6 +62,6 @@ dist: clean
     [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2
     mkdir i3lock-${VERSION}
     cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION}
-    sed -e 's/^I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile
+    sed -e 's/^\s*I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile
     tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION}
     rm -rf i3lock-${VERSION}