i3status.conf: fix indention

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index c7635ddf85bf249b1e44a2c0ac3f55340649fa51..5f1c00eebb000049967700dee298e1b8177e56a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,25 @@
+ifndef PREFIX
+  PREFIX=/usr
+endif
+ifndef SYSCONFDIR
+  ifeq ($(PREFIX),/usr)
+    SYSCONFDIR=/etc
+  else
+    SYSCONFDIR=$(PREFIX)/etc
+  endif
+endif
+
 CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
 CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
-CFLAGS+=-DPREFIX=\"\"
+CFLAGS+=-DSYSCONFDIR=\"$(SYSCONFDIR)\"
+CFLAGS+=-DVERSION=\"${GIT_VERSION}\"
 CFLAGS+=-Iinclude
 LDFLAGS+=-lconfuse
 
-VERSION=$(shell git describe --tags --abbrev=0)
+VERSION:=$(shell git describe --tags --abbrev=0)
+GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
 
 ifeq ($(shell uname),Linux)
 CFLAGS+=-DLINUX
@@ -18,8 +31,6 @@ ifeq ($(shell uname),GNU/kFreeBSD)
 CFLAGS+=-lbsd
 endif
 
-# Define this if you want i3status to spit out dzen2-compatible output on stdout
-#CFLAGS+=-DDZEN
 CFLAGS+=$(EXTRA_CFLAGS)
 
 OBJS:=$(wildcard src/*.c *.c)
@@ -66,5 +77,7 @@ release:
        mkdir i3status-${VERSION}/man
        find src -maxdepth 1 -type f \( -regex ".*\.\(c\|h\)" \) -exec cp '{}' i3status-${VERSION}/src \;
        find man -maxdepth 1 -type f \( -regex ".*\.\(1\|man\|conf\)" -or -name "Makefile" \) -exec cp '{}' i3status-${VERSION}/man \;
+       cp -r include i3status-${VERSION}
+       sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
        tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
        rm -rf i3status-${VERSION}