From 586a437771e76d4152200d8b5b844c6bcd2d670c Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Thu, 11 Jan 2018 05:57:47 +0000
Subject: [PATCH] Refactor sfcgal extension script to use generic include

This is an attempt to fix upgrade test on Debbie, saying:
ERROR:  extension "postgis_sfcgal" does not exist

ref: https://debbie.postgis.net/job/PostGIS_Regress/8259/console

git-svn-id: http://svn.osgeo.org/postgis/trunk@16253 b70326c6-7e19-0410-871a-916f4a2858ee
---
 extensions/postgis_sfcgal/Makefile.in         | 26 +++++++++++++------
 .../postgis_sfcgal/postgis_sfcgal.control.in  |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 24f4a5f6f..0fb1437c6 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -22,15 +22,28 @@ PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
                         $(GREP) "[a-zA-Z]" | \
                         $(PERL) -pe 's/(\d+[a-zA-Z]+)\d*/\1/'
 
-DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
+DATA_built = \
+	$(EXTENSION).control \
+	sql/$(EXTENSION)--$(EXTVERSION).sql \
+	sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql \
+	$(NULL)
+
+# Scripts making up the extension minor upgrade file
+# NOTE: order matters
+EXTENSION_UPGRADE_SCRIPTS = \
+	sql_bits/sfcgal_upgrade_minor.sql
 
 PG_CONFIG    =  @PG_CONFIG@
 
 SQL_BITS     = $(wildcard sql_bits/*.sql)
 EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
 
-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
+$(EXTENSION).control: $(EXTENSION).control.in Makefile
+	cat $< \
+		| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
+		> $@
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 	mkdir -p sql
@@ -75,13 +88,10 @@ sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcg
 	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
-sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql
-	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
-  	  cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
-	done
+sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
+	cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
 
-DATA = $(wildcard sql/*--*.sql)
-EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
+include ../upgrade-paths-rules.mk
 
 distclean: clean
 	rm Makefile
diff --git a/extensions/postgis_sfcgal/postgis_sfcgal.control.in b/extensions/postgis_sfcgal/postgis_sfcgal.control.in
index e478dc073..9d9eb2906 100644
--- a/extensions/postgis_sfcgal/postgis_sfcgal.control.in
+++ b/extensions/postgis_sfcgal/postgis_sfcgal.control.in
@@ -1,5 +1,5 @@
 # postgis topology extension
 comment = 'PostGIS SFCGAL functions'
-default_version = '@POSTGIS_LIB_VERSION@'
+default_version = '@EXTVERSION@'
 relocatable = true
 requires = postgis
-- 
2.40.0