i3lock-color

Index Commits Files Refs README LICENSE

commit 6e63604fff793662cf2be4b1df3ad9a6e4a6051f
parent 38a70376f23c508650b0462ba1c4cc7a1ebb58bd
Author: Chris Guillott <chris@techfo.xyz>
Date:   Sun, 14 Aug 2016 11:51:52 -0500

merge upstream

Diffstat:
A
I3LOCK_VERSION
 | 
1
+
M
Makefile
 | 
18
+++++++++++++-----

2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION
@@ -0,0 +1 @@
+2.8-non-git
diff --git a/Makefile b/Makefile
@@ -1,3 +1,5 @@
+TOPDIR=$(shell pwd)
+
 INSTALL=install
 PREFIX=/usr
 SYSCONFDIR=/etc
@@ -23,9 +25,15 @@ LIBS += -lm
 FILES:=$(wildcard *.c)
 FILES:=$(FILES:.c=.o)
 
-VERSION:=$(shell git describe --tags --abbrev=0)
-GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
-CPPFLAGS += -DVERSION=\"${GIT_VERSION}\"
+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)'
+else
+  VERSION:=$(shell git describe --tags --abbrev=0)
+  I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
+endif
+CPPFLAGS += -DVERSION=\"${I3LOCK_VERSION}\"
 
 .PHONY: install clean uninstall
 
@@ -53,7 +61,7 @@ dist: clean
     [ ! -d i3lock-${VERSION} ] || rm -rf i3lock-${VERSION}
     [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2
     mkdir i3lock-${VERSION}
-    cp *.c *.h i3lock.1.gz i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION}
-    sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile
+    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
     tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION}
     rm -rf i3lock-${VERSION}