]> granicus.if.org Git - postgis/commitdiff
Use macro GREP instead of hardcoded
authorPaul Ramsey <pramsey@cleverelephant.ca>
Tue, 24 Jun 2014 21:04:24 +0000 (21:04 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Tue, 24 Jun 2014 21:04:24 +0000 (21:04 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@12645 b70326c6-7e19-0410-871a-916f4a2858ee

extensions/postgis_tiger_geocoder/Makefile.in

index decc331a6f41d402310816282f6364540e16d730..e2bcaa7e6b07db9298b12bca815a079a0a456133 100644 (file)
@@ -3,25 +3,26 @@ include ../upgradeable_versions.mk
 EXTENSION    = postgis_tiger_geocoder
 EXTVERSION    = @POSTGIS_LIB_VERSION@
 MINORVERSION  = 2011.@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))
 
 PG_CONFIG    =  @PG_CONFIG@
 
-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/*.sql ${SQL_BITS}