From: Sandro Santilli <strk@keybit.net>
Date: Thu, 27 Dec 2012 23:38:18 +0000 (+0000)
Subject: Use grep found by ./configure
X-Git-Tag: 2.1.0beta2~256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5025dac1fe24b946763ef1b9497527232d5712e1;p=postgis

Use grep found by ./configure

git-svn-id: http://svn.osgeo.org/postgis/trunk@10939 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 5abc36e11..b3bdc36f1 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -3,18 +3,19 @@ include ../upgradeable_versions.mk
 EXTENSION     = postgis
 EXTVERSION    = @POSTGIS_LIB_VERSION@
 MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
+GREP = @GREP@
 
 MICRO_NUMBER  = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/")
 PREREL_NUMBER = $(shell echo $(EXTVERSION) | \
                         sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \
-                        grep "[a-zA-Z]" | \
+                        $(GREP) "[a-zA-Z]" | \
                         sed "s/[0-9][a-zA-Z]\([0-9]*\)[a-zA-Z]*/\1/")
 MICRO_PREV    = $(shell if test "$(MICRO_NUMBER)x" != "x"; then expr $(MICRO_NUMBER) - 1; fi)
 PREREL_PREV   = $(shell if test "$(PREREL_NUMBER)x" != "x"; then expr $(PREREL_NUMBER) - 1; fi)
 
 PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
                         sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \
-                        grep "[a-zA-Z]" | \
+                        $(GREP) "[a-zA-Z]" | \
                         sed "s/\([0-9][a-zA-Z]*\)[0-9]*/\1/")
 
 DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
@@ -22,7 +23,7 @@ DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
 #DOCS         = $(wildcard ../../doc/html/*.html)
 PG_CONFIG    = @PGCONFIG@
 
-PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
+PG91         = $(shell $(PG_CONFIG) --version | $(GREP) -qE " 8\.| 9\.0" && echo no || echo yes)
 SQL_BITS     = $(wildcard sql_bits/*.sql)
 EXTRA_CLEAN += ${SQL_BITS} sql/*.sql