1*4882a593SmuzhiyunFrom 6180ca780e3a792bd632d8899c2b35991822c93d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Mon, 8 Feb 2016 23:32:57 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Makefile: allow passing a custom path to libgcrypt-config 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe libgcrypt-config program may not be in the PATH, so this patch 7*4882a593Smuzhiyunadjusts the Makefile so that it understands a LIBGCRYPT_CONFIG 8*4882a593Smuzhiyunvariable. By default, its value is libgcrypt-config so that the 9*4882a593Smuzhiyunbehavior is unchanged. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun Makefile | 5 +++-- 15*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 2 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/Makefile b/Makefile 18*4882a593Smuzhiyunindex ea2cd41..649ddfb 100644 19*4882a593Smuzhiyun--- a/Makefile 20*4882a593Smuzhiyun+++ b/Makefile 21*4882a593Smuzhiyun@@ -61,13 +61,14 @@ BINSRCS = $(addsuffix .c,$(BINS)) 22*4882a593Smuzhiyun VERSION ?= $(shell sh mk-version) 23*4882a593Smuzhiyun RELEASE_VERSION := $(shell cat VERSION) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun+LIBGCRYPT_CONFIG ?= libgcrypt-config 26*4882a593Smuzhiyun CC ?= gcc 27*4882a593Smuzhiyun CFLAGS ?= -O3 -g 28*4882a593Smuzhiyun override CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings 29*4882a593Smuzhiyun-override CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) 30*4882a593Smuzhiyun+override CFLAGS += $(shell $(LIBGCRYPT_CONFIG) --cflags) $(CRYPTO_CFLAGS) 31*4882a593Smuzhiyun override CPPFLAGS += -DVERSION=\"$(VERSION)\" 32*4882a593Smuzhiyun LDFLAGS ?= -g 33*4882a593Smuzhiyun-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) 34*4882a593Smuzhiyun+LIBS += $(shell $(LIBGCRYPT_CONFIG) --libs) $(CRYPTO_LDADD) 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun ifeq ($(shell uname -s), SunOS) 37*4882a593Smuzhiyun LIBS += -lnsl -lresolv -lsocket 38*4882a593Smuzhiyun-- 39*4882a593Smuzhiyun2.6.4 40*4882a593Smuzhiyun 41