[postgis-tickets] r17760 - Quote expr arguments, consistently use variables

[Sandro Santilli]

Author: strk
Date: 2019-08-22 08:59:39 -0700 (Thu, 22 Aug 2019)
New Revision: 17760

Modified:
   trunk/postgis/Makefile.in
   trunk/regress/core/Makefile.in
Log:
Quote expr arguments, consistently use variables

Modified: trunk/postgis/Makefile.in
===================================================================
--- trunk/postgis/Makefile.in	2019-08-22 14:59:53 UTC (rev 17759)
+++ trunk/postgis/Makefile.in	2019-08-22 15:59:39 UTC (rev 17760)
@@ -23,6 +23,7 @@
 # **********************************************************************
 
 POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
+PROTOC_VERSION=@PROTOC_VERSION@
 MODULE_big=postgis- at POSTGIS_MAJOR_VERSION@
 MODULEDIR=contrib/postgis- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
 MODULEPATH    = $$libdir/postgis- at POSTGIS_MAJOR_VERSION@
@@ -58,7 +59,7 @@
 
 ifeq (@HAVE_PROTOBUF@,yes)
 PROTOBUF_OBJ = vector_tile.pb-c.o
-ifeq ($(shell expr @PROTOC_VERSION@ ">=" 1001000),1)
+ifeq ($(shell expr "$(PROTOC_VERSION)" ">=" 1001000),1)
 PROTOBUF_OBJ += geobuf.pb-c.o
 endif
 UTHASH_INCLUDE = -I../deps/uthash/include
@@ -223,7 +224,7 @@
 ifeq (@HAVE_PROTOBUF@,yes)
 lwgeom_out_mvt.o: vector_tile.pb-c.h
 mvt.o: vector_tile.pb-c.h
-ifeq ($(shell expr $(PROTOC_VERSION) ">=" 1001000),1)
+ifeq ($(shell expr "$(PROTOC_VERSION)" ">=" 1001000),1)
 lwgeom_out_geobuf.o: geobuf.pb-c.h
 geobuf.o: geobuf.pb-c.h
 endif

Modified: trunk/regress/core/Makefile.in
===================================================================
--- trunk/regress/core/Makefile.in	2019-08-22 14:59:53 UTC (rev 17759)
+++ trunk/regress/core/Makefile.in	2019-08-22 15:59:39 UTC (rev 17760)
@@ -174,7 +174,7 @@
 	concave_hull_hard \
 	knn_recheck
 
-ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 37),1)
+ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 37),1)
 	# GEOS-3.7 adds:
 	# ST_FrechetDistance
 	TESTS += \
@@ -181,7 +181,7 @@
 		frechet
 endif
 
-ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 38),1)
+ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 38),1)
 	# GEOS-3.8 adds stable pointonsurface implementation
 	TESTS += \
 		geos38
@@ -216,7 +216,7 @@
 	TESTS += \
 		mvt \
 		mvt_jsonb
-ifeq ($(shell expr $(PROTOC_VERSION) ">=" 1001000),1)
+ifeq ($(shell expr "$(PROTOC_VERSION)" ">=" 1001000),1)
 	TESTS += \
 		geobuf
 endif