bump version in asciidoc.conf

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 6ec32bd48f359d6483cb616e8d706ec9a6f51042..5f1c00eebb000049967700dee298e1b8177e56a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,19 @@
+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
@@ -66,6 +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}