print version number when invoked with -v

diff --git a/Makefile b/Makefile
index 7cb505258f8d2b9858648857d7191010f93cbd89..6b00e9a86b71c6551ebd59b63d6e23e75fa2039a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,8 @@ 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))"
+CFLAGS += -DVERSION=\"${GIT_VERSION}\"
 
 .PHONY: install clean uninstall
 

diff --git a/i3lock.c b/i3lock.c
index ba742d1bdb4d66444ba11b6c779c17b71012452a..d1add207cf8d3efde9bd1303e5e16fec333d20ec 100644 (file)
--- a/i3lock.c
+++ b/i3lock.c
@@ -267,7 +267,7 @@ int main(int argc, char *argv[]) {
     while ((o = getopt_long(argc, argv, "vnbdi:c:tp:", longopts, &optind)) != -1) {
         switch (o) {
         case 'v':
-            errx(EXIT_SUCCESS, "i3lock © 2010 Michael Stapelberg\n");
+            errx(EXIT_SUCCESS, "version " VERSION " © 2010 Michael Stapelberg\n");
         case 'n':
             dont_fork = true;
             break;