From: somasissounds at gmail.com (Kylie McClain)
Subject: [PATCH] cgit.mk: Use $PKG_CONFIG
Date: Tue, 14 Jun 2016 17:14:28 -0400 [thread overview]
Message-ID: <CAOji9TA-CidkD47gNhp9TfZkyogJbvV=1SHHTygrtJSA2PrPwQ@mail.gmail.com> (raw)
In-Reply-To: <20160607212235.9496-1-somasissounds@gmail.com>
On Tue, Jun 7, 2016 at 5:22 PM, Kylie McClain <somasissounds at gmail.com> wrote:
> From: Kylie McClain <somasis at exherbo.org>
>
> PKG_CONFIG is a variable dictated by autoconf standards; it should
> be used if set.
> ---
> cgit.mk | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/cgit.mk b/cgit.mk
> index 1b50307..369f309 100644
> --- a/cgit.mk
> +++ b/cgit.mk
> @@ -21,6 +21,8 @@ CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
> CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
> CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
>
> +PKG_CONFIG ?= pkg-config
> +
> ifdef NO_C99_FORMAT
> CFLAGS += -DNO_C99_FORMAT
> endif
> @@ -31,7 +33,7 @@ ifdef NO_LUA
> else
> ifeq ($(LUA_PKGCONFIG),)
> LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
> - pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \
> + $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \
> done)
> LUA_MODE := autodetected
> else
> @@ -39,8 +41,8 @@ else
> endif
> ifneq ($(LUA_PKGCONFIG),)
> LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
> - LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
> - LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
> + LUA_LIBS := $(shell $(PKG_CONFIG) --libs $(LUA_PKGCONFIG) 2>/dev/null)
> + LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null)
> CGIT_LIBS += $(LUA_LIBS)
> CGIT_CFLAGS += $(LUA_CFLAGS)
> else
> --
> 2.8.3
>
ping?
next prev parent reply other threads:[~2016-06-14 21:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 21:22 somasissounds
2016-06-14 21:14 ` somasissounds [this message]
2016-06-17 10:36 ` Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOji9TA-CidkD47gNhp9TfZkyogJbvV=1SHHTygrtJSA2PrPwQ@mail.gmail.com' \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).