From 20bf00dfa56ef9584d25777031ac4d11360386a8 Mon Sep 17 00:00:00 2001 From: Arnaud Lefebvre Date: Thu, 2 Jun 2016 21:09:09 +0200 Subject: [PATCH] Use PKG_CONFIG environment variable if it exists pkg-config is not always available in the path so let people choose where it's located Signed-off-by: Arnaud Lefebvre --- hack/make.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index bbe8a9a4df..e9e3dcc03b 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -26,6 +26,7 @@ set -o pipefail export DOCKER_PKG='github.com/docker/docker' export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export MAKEDIR="$SCRIPTDIR/make" +export PKG_CONFIG=${PKG_CONFIG:-pkg-config} : ${TEST_REPEAT:=0} @@ -134,9 +135,9 @@ if [ "$DOCKER_EXPERIMENTAL" ]; then fi DOCKER_BUILDTAGS+=" daemon" -if pkg-config 'libsystemd >= 209' 2> /dev/null ; then +if ${PKG_CONFIG} 'libsystemd >= 209' 2> /dev/null ; then DOCKER_BUILDTAGS+=" journald" -elif pkg-config 'libsystemd-journal' 2> /dev/null ; then +elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then DOCKER_BUILDTAGS+=" journald journald_compat" fi