From 3c22870c762f7925b5ff143d76f9affbade275ba Mon Sep 17 00:00:00 2001 From: Matthieu Crapet Date: Fri, 28 Mar 2014 14:11:15 +0100 Subject: Make.Rules: add gperf detection and fix INDENT test Move gperf detection from libcap/Makefile to Make.Rules to be more cross-environment friendly. Fix INDENT test (dollar sign must be doubled): http://www.gnu.org/software/make/manual/make.html#Variables-in-Recipes Signed-off-by: Matthieu Crapet Signed-off-by: Andrew G Morgan --- Make.Rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Make.Rules') diff --git a/Make.Rules b/Make.Rules index ec1c474..882b033 100644 --- a/Make.Rules +++ b/Make.Rules @@ -61,13 +61,14 @@ WARNINGS=-Wall -Wwrite-strings \ -Wnested-externs -Winline -Wshadow LD=$(CC) -Wl,-x -shared LDFLAGS := #-g +BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) SYSTEM_HEADERS = /usr/include INCS=$(topdir)/libcap/include/sys/capability.h LDFLAGS += -L$(topdir)/libcap CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) -INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) +INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) LIBATTR := yes -- cgit v1.2.3