More sed tweaks to Makefile for portability.

schmiddy · schmiddy · commit 95ce24c2a0f0 · 2013-05-21T21:45:47.000-04:00
The -E flag to specify extended regular expressions apparently is
not portable to all platforms, such as CentOS 4.5. Use an uglier
but hopefully more portable basic regular expression in Makefiles.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ $(error pg_config not found)
 endif
 
 # version as a number, e.g. 9.1.4 -> 901
-INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed -E 's/([0-9]+)\.([0-9]+).*/\1*100+\2/'))))
+INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed 's/\([[:digit:]]\{1,\}\)\.\([[:digit:]]\{1,\}\).*/\1*100+\2/'))))
 
 # We support PostgreSQL 8.3 and later.
 ifeq ($(shell echo $$(($(INTVERSION) < 803))),1)
diff --git a/lib/Makefile b/lib/Makefile
@@ -10,7 +10,7 @@ PG_CONFIG ?= pg_config
 
 # version as a number, e.g. 9.1.4 -> 901
 VERSION := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
-INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed -E 's/([0-9]+)\.([0-9]+).*/\1*100+\2/'))))
+INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed 's/\([[:digit:]]\{1,\}\)\.\([[:digit:]]\{1,\}\).*/\1*100+\2/'))))
 
 EXTENSION = pg_repack
 MODULE_big = $(EXTENSION)
diff --git a/regress/Makefile b/regress/Makefile
@@ -10,7 +10,7 @@ PG_CONFIG ?= pg_config
 
 # version as a number, e.g. 9.1.4 -> 901
 VERSION := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
-INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed -E 's/([0-9]+)\.([0-9]+).*/\1*100+\2/'))))
+INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed 's/\([[:digit:]]\{1,\}\)\.\([[:digit:]]\{1,\}\).*/\1*100+\2/' ))))
 
 
 #

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ PG_CONFIG ?= pg_config`
`10`	`10`
`11`	`11`	`# version as a number, e.g. 9.1.4 -> 901`
`12`	`12`	`VERSION := $(shell $(PG_CONFIG) --version \| awk '{print $$2}')`
`13`		`-INTVERSION := $(shell echo $$(($$(echo $(VERSION) \| sed -E 's/([0-9]+)\.([0-9]+)./\1100+\2/'))))`
	`13`	`+INTVERSION := $(shell echo $$(($$(echo $(VERSION) \| sed 's/\([[:digit:]]\{1,\}\)\.\([[:digit:]]\{1,\}\)./\1100+\2/' ))))`
`14`	`14`
`15`	`15`
`16`	`16`	`#`