diff options
| author | eplanet <emeric.planet@gmail.com> | 2016-08-13 22:46:35 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2016-08-13 13:46:35 -0700 |
| commit | 0d111aaede55c7388aac7ebb1da3d7907d3db843 (patch) | |
| tree | 8b6c6b7e8ca2fa921135e6d2b55b408baad5d555 | |
| parent | cca7d4e6c39d4fd36ca4cd7dd8333bb1cc313a62 (diff) | |
Added version files for release tarball. Fixes #40 (#86)
| -rw-r--r-- | I3LOCK_VERSION | 1 | ||||
| -rw-r--r-- | Makefile | 16 |
2 files changed, 13 insertions, 4 deletions
diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION new file mode 100644 index 0000000..4d97839 --- /dev/null +++ b/I3LOCK_VERSION @@ -0,0 +1 @@ +2.8-non-git @@ -1,3 +1,5 @@ +TOPDIR=$(shell pwd) + INSTALL=install PREFIX=/usr SYSCONFDIR=/etc @@ -21,9 +23,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 @@ -49,6 +57,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/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile + 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} |