Merge pull request #291 from duskCoder/cap_net_admin

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 3084ae7ddfa67dbea4eb9399909a84b95a9fcc4e..c5427b9995b473780afc5ed077c095efdfa8d515 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ ifndef SYSCONFDIR
   endif
 endif
 
+PKG_CONFIG ?= pkg-config
 CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
 CFLAGS+=-g
 CFLAGS+=-std=gnu99
@@ -40,8 +41,8 @@ OS:=$(shell uname)
 ifeq ($(OS),Linux)
 CPPFLAGS+=-DLINUX
 CPPFLAGS+=-D_GNU_SOURCE
-CFLAGS += $(shell pkg-config --cflags libnl-genl-3.0)
-LIBS += $(shell pkg-config --libs libnl-genl-3.0)
+CFLAGS += $(shell $(PKG_CONFIG) --cflags libnl-genl-3.0)
+LIBS += $(shell $(PKG_CONFIG) --libs libnl-genl-3.0)
 LIBS+=-lasound
 endif
 
@@ -98,6 +99,9 @@ i3status: ${OBJS}
        $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
        @echo " LD $@"
 
+test: i3status
+       LC_ALL=C ./travis/run-tests.pl
+
 clean:
        rm -f *.o src/*.o
 
@@ -112,8 +116,6 @@ install:
        install -m 755 -d $(DESTDIR)$(SYSCONFDIR)
        install -m 755 -d $(DESTDIR)$(MANPREFIX)/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)$(MANPREFIX)/share/man/man1