| 1 |
commit: 0077e54146c0c6180769bb5fa2d8da2924038baa |
| 2 |
Author: Julian Ospald <hasufell <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Wed Jun 29 12:27:37 2016 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 18:50:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=0077e541 |
| 7 |
|
| 8 |
Build: fix hardcoded pkg-config invocation |
| 9 |
|
| 10 |
This fixes #89. |
| 11 |
|
| 12 |
mk/sys.mk | 1 + |
| 13 |
mk/termcap.mk | 4 ++-- |
| 14 |
2 files changed, 3 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mk/sys.mk b/mk/sys.mk |
| 17 |
index 948ec1d..47d9526 100644 |
| 18 |
--- a/mk/sys.mk |
| 19 |
+++ b/mk/sys.mk |
| 20 |
@@ -11,6 +11,7 @@ |
| 21 |
|
| 22 |
AR?= ar |
| 23 |
CP?= cp |
| 24 |
+PKG_CONFIG?= pkg-config |
| 25 |
ECHO?= echo |
| 26 |
INSTALL?= install |
| 27 |
RANLIB?= ranlib |
| 28 |
|
| 29 |
diff --git a/mk/termcap.mk b/mk/termcap.mk |
| 30 |
index 2d6ad01..4890e35 100644 |
| 31 |
--- a/mk/termcap.mk |
| 32 |
+++ b/mk/termcap.mk |
| 33 |
@@ -1,6 +1,6 @@ |
| 34 |
ifeq (${MKTERMCAP},ncurses) |
| 35 |
-TERMCAP_CFLAGS:= $(shell pkg-config ncurses --cflags 2> /dev/null) |
| 36 |
-LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) |
| 37 |
+TERMCAP_CFLAGS:= $(shell ${PKG_CONFIG} ncurses --cflags 2> /dev/null) |
| 38 |
+LTERMCAP:= $(shell ${PKG_CONFIG} ncurses --libs 2> /dev/null) |
| 39 |
ifeq ($(LTERMCAP),) |
| 40 |
LIBTERMCAP?= -lncurses |
| 41 |
else |
Archives