diff options
| author | Ingo Bürk <admin@airblader.de> | 2017-06-18 18:32:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 18:32:46 +0200 |
| commit | 8293749cfb08c3151928fa16a208c9a7da6d3281 (patch) | |
| tree | b59831a8ded91ef1a708766e2b8426f1c66f94f2 | |
| parent | 5ab19daa5cd3ebb63ecc389fb7d5420e91f8d799 (diff) | |
| parent | a0abccf8f362c864b4e46251684bf9c2c33ce168 (diff) | |
Merge pull request #132 from stapelberg/fix-version
Fix version
| -rw-r--r-- | I3LOCK_VERSION | 2 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION index 4d97839..5ed7db2 100644 --- a/I3LOCK_VERSION +++ b/I3LOCK_VERSION @@ -1 +1 @@ -2.8-non-git +2.9-non-git @@ -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} |