#2867 can't upgrde sfcgal extension - got rid of begin/commit in upgrade and duplicat...

git-svn-id: http://svn.osgeo.org/postgis/trunk@13851 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index e2ce729017fee9698602ac914d154a22f47ca036..176030530ea80e092ddea13743035d6717defd8d 100644 (file)
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -39,7 +39,7 @@ sql/$(EXTENSION).sql: sql_bits/sfcgal.sql  sql_bits/sfcgal_comments.sql
        cat $^ > $@
 
 #this is a cludge to allow upgrading from same SVN to same SVN
-sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade_minor.sql sql_bits/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
+sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql_bits/sfcgal_upgrade_minor.sql
        mkdir -p sql
        cat $^ > $@
 sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
@@ -62,11 +62,11 @@ 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 postgis_topology > $@
+       cat $< | ../../utils/create_unpackaged.pl ${EXTENSION} > $@
 
 sql_bits/sfcgal_upgrade.sql : ../../postgis/sfcgal_upgrade.sql
        mkdir -p sql_bits
-       cp $< $@
+       sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
 
 sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
        mkdir -p sql_bits