PolytreeDE/i3lock-color
1
0
Fork 0
mirror of https://github.com/Raymo111/i3lock-color.git synced 2024-11-11 13:50:52 -05:00
Code Releases Activity

merge upstream

Browse source
This commit is contained in:
Chris Guillott 2016-08-14 11:51:52 -05:00
commit 6e63604fff
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
I3LOCK_VERSION Normal file
View file

@ -0,0 +1 @@
2.8-non-git

18
Makefile
View file

@ -1,3 +1,5 @@
TOPDIR=$(shell pwd)
INSTALL=install INSTALL=install
PREFIX=/usr PREFIX=/usr
SYSCONFDIR=/etc SYSCONFDIR=/etc
@ -23,9 +25,15 @@ LIBS += -lm
FILES:=$(wildcard *.c) FILES:=$(wildcard *.c)
FILES:=$(FILES:.c=.o) FILES:=$(FILES:.c=.o)
VERSION:=$(shell git describe --tags --abbrev=0) ifeq ($(wildcard .git),)
GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" # not in git repository
CPPFLAGS += -DVERSION=\"${GIT_VERSION}\" 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 .PHONY: install clean uninstall
@ -53,7 +61,7 @@ dist: clean
[ ! -d i3lock-${VERSION} ] || rm -rf i3lock-${VERSION} [ ! -d i3lock-${VERSION} ] || rm -rf i3lock-${VERSION}
[ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2 [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2
mkdir i3lock-${VERSION} mkdir i3lock-${VERSION}
cp *.c *.h i3lock.1.gz i3lock.pam Makefile LICENSE README.md CHANGELOG 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} tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION}
rm -rf i3lock-${VERSION} rm -rf i3lock-${VERSION}