]> granicus.if.org Git - postgis/commitdiff
Drop transaction control from extension enabler
authorSandro Santilli <strk@kbt.io>
Tue, 11 Sep 2018 09:19:03 +0000 (09:19 +0000)
committerSandro Santilli <strk@kbt.io>
Tue, 11 Sep 2018 09:19:03 +0000 (09:19 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@16737 b70326c6-7e19-0410-871a-916f4a2858ee

postgis/Makefile.in

index 88db06c7cd09b2a7d9bb7bb0b98e3a19b83abb6e..c6b5fe7ec46373b00b3e4f2b62caeb77c1ebc40d 100644 (file)
@@ -221,7 +221,9 @@ postgis_upgrade_for_extension.sql: postgis_drop_before.sql postgis_upgrade_for_e
 
 postgis_for_extension.sql: postgis.sql.in
        $(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" > $@
+       $(PERL) -lpe \
+               "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" \
+               | $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' > $@
 
 #this is redundant but trying to fold in with extension just hangs
 postgis_upgrade.sql.in: postgis.sql ../utils/postgis_proc_upgrade.pl