Fix unpackaged extension creation check

See #3892

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 4e7fb4c85f7ab5630085aa6500cec14af344ce1c..0dc25b89581521e2f5c648e97892e8d0e50b6249 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -80,7 +80,6 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
        cp $< $@
 
 sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl unpackaged_check.sql Makefile | sql
-       cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
        # Ensure version is correct
        cat unpackaged_check.sql > $@
        cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) \

diff --git a/extensions/postgis/unpackaged_check.sql.in b/extensions/postgis/unpackaged_check.sql.in
index eb4b26b72e53c55757afbe240e38059e958df0c5..19152f673e593f9adf87e49a527597487bb3f607 100644 (file)
--- a/extensions/postgis/unpackaged_check.sql.in
+++ b/extensions/postgis/unpackaged_check.sql.in
@@ -5,8 +5,9 @@ BEGIN
        ver := split_part(postgis_scripts_installed(), ' ', 1);
        IF ver != '@EXTVERSION@' THEN
                RAISE EXCEPTION 'Installed PostGIS version is %', ver
-               USING HINT = 'Try `CREATE EXTENSION postgis VERSION ''@EXTVERSION@'' from unpackaged`,'
-                           'or source postgis_upgrade.sql`';
+               USING HINT = 'Try `CREATE EXTENSION postgis VERSION '''
+                       || ver || ''' from unpackaged`,'
+                       ' or source postgis_upgrade.sql`';
        END IF;
 END;
 $$ LANGUAGE 'plpgsql';