Merge remote-tracking branch 'origin/master' into pg10

This commit is contained in:
Daniele Varrazzo
2017-09-25 02:45:49 +01:00
9 changed files with 165 additions and 26 deletions

View File

@ -24,6 +24,7 @@ INTVERSION := $(shell echo $$(($$(echo $(VERSION).0 | sed 's/\([[:digit:]]\{1,\}
EXTVERSION = $(shell grep '"version":' META.json | head -1 \
| sed -e 's/[ ]*"version":[ ]*"\(.*\)",/\1/')
# NOTE: keep consistent with META.json
ifeq ($(shell echo $$(($(INTVERSION) < 901))),1)
$(error $(EXTENSION) requires PostgreSQL 9.1 or later. This is $(VERSION))
endif