From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 9 Oct 2011 21:35:58 +0000 (-0300)
Subject: common.mk: Silence some remaining pkg-config calls.
X-Git-Tag: 4.1~107
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=99825ff2684a85bb6cf53d4e0857393e40028c6f;p=i3%2Fi3

common.mk: Silence some remaining pkg-config calls.

Some pkg-config calls still didn't redirect stderr to /dev/null, causing
the gnome-config error messages to be printed.
---

diff --git a/common.mk b/common.mk
index 4237114d..bc831615 100644
--- a/common.mk
+++ b/common.mk
@@ -31,7 +31,7 @@ endif
 # We redirect stderr to /dev/null because pkg-config prints an error if support
 # for gnome-config was enabled but gnome-config is not actually installed.
 cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
-ldflags_for_lib = $(shell pkg-config --exists $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
+ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
 
 CFLAGS += -std=c99
 CFLAGS += -pipe
@@ -61,7 +61,7 @@ CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
 CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
 CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
 
-ifeq ($(shell pkg-config --atleast-version=8.10 libpcre && echo 1),1)
+ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
 CPPFLAGS += -DPCRE_HAS_UCP=1
 endif