Bugfix: Correctly check for interface up/down-status (Thanks docsteel)

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 78984f6275a40ff3272258c99054f7b67baef524..c7635ddf85bf249b1e44a2c0ac3f55340649fa51 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
-CFLAGS+=-I.
+CFLAGS+=-Iinclude
 LDFLAGS+=-lconfuse
 
 VERSION=$(shell git describe --tags --abbrev=0)
@@ -11,7 +11,7 @@ VERSION=$(shell git describe --tags --abbrev=0)
 ifeq ($(shell uname),Linux)
 CFLAGS+=-DLINUX
 CFLAGS+=-D_GNU_SOURCE
-LDFLAGS+=-liw
+LDFLAGS+=-liw -lasound
 endif
 
 ifeq ($(shell uname),GNU/kFreeBSD)
@@ -19,7 +19,7 @@ CFLAGS+=-lbsd
 endif
 
 # Define this if you want i3status to spit out dzen2-compatible output on stdout
-CFLAGS+=-DDZEN
+#CFLAGS+=-DDZEN
 CFLAGS+=$(EXTRA_CFLAGS)
 
 OBJS:=$(wildcard src/*.c *.c)
@@ -53,12 +53,18 @@ install:
        install -m 755 -d $(DESTDIR)/etc
        install -m 755 -d $(DESTDIR)/usr/share/man/man1
        install -m 755 i3status $(DESTDIR)/usr/bin/i3status
+       # Allow network configuration for getting the link speed
+       (which setcap && setcap cap_net_admin=ep $(DESTDIR)/usr/bin/i3status) || true
        install -m 644 i3status.conf $(DESTDIR)/etc/i3status.conf
-       install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
+       install -m 644 man/i3status.1 $(DESTDIR)/usr/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 \;
        tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
        rm -rf i3status-${VERSION}