From 9cc420e39e5bb78067059968e78c9a95f8c35129 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Wed, 29 Nov 2017 00:18:54 +0000 Subject: [PATCH] Explicitly specify $(PERL) to call create_unpackaged.pl otherwise at least on freebsd it fails Also get rid of 9.1 check, we don't support 9.1 anymore. References #3938 for PostGIS 2.4.3 git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@16123 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis_sfcgal/Makefile.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in index fbbe864fb..24f4a5f6f 100644 --- a/extensions/postgis_sfcgal/Makefile.in +++ b/extensions/postgis_sfcgal/Makefile.in @@ -26,18 +26,16 @@ 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) SQL_BITS = $(wildcard sql_bits/*.sql) -EXTRA_CLEAN += sql/*.sql ${SQL_BITS} +EXTRA_CLEAN += sql/*.sql ${SQL_BITS} -ifeq ($(PG91),yes) all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql mkdir -p sql cp $< $@ - + sql/$(EXTENSION).sql: sql_bits/sfcgal.sql sql_bits/sfcgal_comments.sql mkdir -p sql cat $^ > $@ @@ -66,7 +64,7 @@ sql_bits/sfcgal_comments.sql: ../../doc/sfcgal_comments.sql #then remove default values and extra junk sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/sfcgal.sql ../../utils/create_unpackaged.pl mkdir -p sql - cat $< | ../../utils/create_unpackaged.pl ${EXTENSION} > $@ + cat $< | $(PERL) ../../utils/create_unpackaged.pl ${EXTENSION} > $@ sql_bits/sfcgal_upgrade.sql : ../../postgis/sfcgal_upgrade.sql mkdir -p sql_bits @@ -81,10 +79,9 @@ sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \ cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \ done - + DATA = $(wildcard sql/*--*.sql) EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql -endif distclean: clean rm Makefile -- 2.40.0