Fix configuration paths in error message

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index bcbb73d30f8e2213684447c70ef81956a934351a..0cd1c56d20422f720df558c7ba1ea74fd74dee3b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,54 @@
+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+=-I.
+CPPFLAGS+=-DSYSCONFDIR=\"$(SYSCONFDIR)\"
+CPPFLAGS+=-DVERSION=\"${GIT_VERSION}\"
+CFLAGS+=-Iinclude
+LIBS+=-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
-CFLAGS+=-D_GNU_SOURCE
-LDFLAGS+=-liw
+CPPFLAGS+=-DLINUX
+CPPFLAGS+=-D_GNU_SOURCE
+LIBS+=-liw
+LIBS+=-lasound
 endif
 
 ifeq ($(shell uname),GNU/kFreeBSD)
-CFLAGS+=-lbsd
+LIBS+=-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)
+OBJS:=$(OBJS:.c=.o)
+
 src/%.o: src/%.c
-       @$(CC) $(CFLAGS) -c -o $@ $<
+       @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
        @echo " CC $<"
 
-%.o: %.c %.h
-       @$(CC) $(CFLAGS) -c -o $@ $<
+%.o: %.c include/%.h
+       @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
        @echo " CC $<"
 
-i3status: src/general.o src/config.o src/get_load.o src/output.o src/get_cpu_temperature.o src/process_runs.o src/get_eth_info.o src/get_ip_addr.o src/get_wireless_info.o src/get_battery_info.o src/get_ipv6_addr.o i3status.o
-       @$(CC) -o $@ src/*.o *.o $(LDFLAGS)
+all: i3status manpage
+
+i3status: ${OBJS}
+       @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
        @echo " LD $@"
 
 clean:
@@ -39,19 +57,28 @@ clean:
 distclean: clean
        rm -f i3status
 
+manpage:
+       $(MAKE) -C man
+
 install:
-       install -m 755 -d $(DESTDIR)/usr/bin
-       install -m 755 -d $(DESTDIR)/etc
-       install -m 755 -d $(DESTDIR)/usr/share/man/man1
-       install -m 755 i3status $(DESTDIR)/usr/bin/i3status
-       install -m 644 i3status.conf $(DESTDIR)/etc/i3status.conf
-       install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
+       install -m 755 -d $(DESTDIR)$(PREFIX)/bin
+       install -m 755 -d $(DESTDIR)$(SYSCONFDIR)
+       install -m 755 -d $(DESTDIR)$(PREFIX)/share/man/man1
+       install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status
+       # Allow network configuration for getting the link speed
+       (which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true
+       install -m 644 i3status.conf $(DESTDIR)$(SYSCONFDIR)/i3status.conf
+       install -m 644 man/i3status.1 $(DESTDIR)$(PREFIX)/share/man/man1
 
 release:
        [ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
        mkdir i3status-${VERSION}
-       find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|1\|h\)" -or -name "Makefile" \) -exec cp '{}' i3status-${VERSION} \;
+       find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "Makefile" -or -name "LICENSE" \) -exec cp '{}' i3status-${VERSION} \;
+       mkdir i3status-${VERSION}/src
+       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}
-
-all: i3status