From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2EE8138306 for ; Wed, 13 Jul 2016 22:03:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E027421C01D; Wed, 13 Jul 2016 22:03:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82D5321C01D for ; Wed, 13 Jul 2016 22:03:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11ED23408A2 for ; Wed, 13 Jul 2016 22:03:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBD522440 for ; Wed, 13 Jul 2016 22:03:13 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1468446725.8bca2cd4b3c710809131ac036456b34c223e8d12.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: mk/ X-VCS-Repository: proj/openrc X-VCS-Files: mk/sys.mk mk/termcap.mk X-VCS-Directories: mk/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8bca2cd4b3c710809131ac036456b34c223e8d12 X-VCS-Branch: master Date: Wed, 13 Jul 2016 22:03:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d77baa08-89c7-45e6-9a52-5e017c36777b X-Archives-Hash: 07fa09130c9016dc23249416374f4d5e commit: 8bca2cd4b3c710809131ac036456b34c223e8d12 Author: Julian Ospald posteo de> AuthorDate: Wed Jun 29 12:27:37 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Jul 13 21:52:05 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8bca2cd4 Build: fix hardcoded pkg-config invocation This fixes #89. mk/sys.mk | 1 + mk/termcap.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/sys.mk b/mk/sys.mk index 948ec1d..47d9526 100644 --- a/mk/sys.mk +++ b/mk/sys.mk @@ -11,6 +11,7 @@ AR?= ar CP?= cp +PKG_CONFIG?= pkg-config ECHO?= echo INSTALL?= install RANLIB?= ranlib diff --git a/mk/termcap.mk b/mk/termcap.mk index 2d6ad01..4890e35 100644 --- a/mk/termcap.mk +++ b/mk/termcap.mk @@ -1,6 +1,6 @@ ifeq (${MKTERMCAP},ncurses) -TERMCAP_CFLAGS:= $(shell pkg-config ncurses --cflags 2> /dev/null) -LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) +TERMCAP_CFLAGS:= $(shell ${PKG_CONFIG} ncurses --cflags 2> /dev/null) +LTERMCAP:= $(shell ${PKG_CONFIG} ncurses --libs 2> /dev/null) ifeq ($(LTERMCAP),) LIBTERMCAP?= -lncurses else