Use variables more (generic cleanup)

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index a28ca572507b1697df9b14c5574c24acba0c5256..830f9d8d25d0f22e0a89c6589149a5040e4968a6 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -29,7 +29,31 @@ DATA_built = \
        sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql \
        $(NULL)
 
-UPGRADE_SCRIPTS = $(wildcard sql/*--*.sql)
+# Scripts making up the extension file
+# NOTE: order matters
+EXTENSION_SCRIPTS = \
+       sql_bits/postgis.sql \
+       sql_bits/postgis_comments.sql \
+       sql_bits/rtpostgis.sql \
+       sql_bits/spatial_ref_sys_config_dump.sql \
+       sql_bits/raster_comments.sql \
+       sql_bits/spatial_ref_sys.sql
+
+# Scripts making up the extension minor upgrade file
+# NOTE: order matters
+EXTENSION_UPGRADE_SCRIPTS = \
+       ../postgis_extension_helper.sql \
+       sql_bits/postgis_upgrade.sql \
+       sql_bits/rtpostgis_upgrade.sql \
+       ../../doc/raster_comments.sql \
+       ../../doc/postgis_comments.sql \
+       ../postgis_extension_helper_uninstall.sql
+
+# Scripts making up the extension upgrade-from-unpackaged file
+# NOTE: order matters
+EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
+       sql_bits/postgis.sql \
+       sql_bits/rtpostgis.sql
 
 #DOCS         = $(wildcard ../../doc/html/*.html)
 PG_CONFIG    = @PG_CONFIG@
@@ -41,7 +65,7 @@ CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
 
 all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
 
-sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
+sql/$(EXTENSION).sql: $(EXTENSION_SCRIPTS)
        mkdir -p sql
        printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
        cat $^ >> $@
@@ -57,9 +81,9 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        mkdir -p sql
        cp $< $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/postgis.sql sql_bits/rtpostgis.sql ../../utils/create_unpackaged.pl
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl
        mkdir -p sql
-       cat ../../postgis/postgis.sql ../../raster/rt_pg/rtpostgis.sql | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
+       cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql
@@ -98,7 +122,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
        cp $< $@
 
 #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
-sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+sql_bits/postgis_extension_upgrade_minor.sql: $(EXTENSION_UPGRADE_SCRIPTS)
        printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
        cat $^ >> $@