Merge pull request #266 from moreais/master

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 97bb646f1a23d48cb44f2d3d4485bfda1c2f65e6..86830ef49a2d811655d004ef495e2f126758cdfc 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
 
@@ -128,6 +129,6 @@ release:
        cp -r include i3status-${VERSION}
        cp -r yajl-fallback i3status-${VERSION}
        cp -r contrib i3status-${VERSION}
-       sed -e 's/^I3STATUS_VERSION:=\(.*\)/I3STATUS_VERSION=${I3STATUS_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
+       echo ${I3STATUS_VERSION} > i3status-${VERSION}/I3STATUS_VERSION
        tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
        rm -rf i3status-${VERSION}