Make upgrade install rule always run when asked (no deps)

This is for topology and tiger_geocoder

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

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 74e6a1689a868f1cd0a12f93233e4fd29c63f9d6..1255d158ddbf5ea8279262b649cd8206a95fd9ad 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -217,9 +217,9 @@ install: install-upgrade-paths
 
 # The "next" lines are a cludge to allow upgrading between different
 # revisions of the same version
-install-upgrade-paths: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
+install-upgrade-paths:
        tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
-       $(INSTALL_DATA) $^ "$(EXTDIR)/$${tpl}"; \
+       $(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
        ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \
        ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql; \
        for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 49c7299d0dd55cf5c14169af387d99845fd5672b..048c634450c5616b8a5c8981acda31aef301b536 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -38,7 +38,7 @@ SQL_BITS     = $(wildcard sql_bits/*.sql)
 EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
 
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        mkdir -p sql
@@ -83,8 +83,6 @@ sql/topology_upgrade.sql:  ../../topology/topology_upgrade.sql
        mkdir -p sql
        sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
 
-sql_minor_upgrade: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
-
 sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
        cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
 
@@ -94,9 +92,9 @@ install: install-upgrade-paths
 
 # The "next" lines are a cludge to allow upgrading between different
 # revisions of the same version
-install-upgrade-paths: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
+install-upgrade-paths:
        tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
-       $(INSTALL_DATA) $^ "$(EXTDIR)/$${tpl}"; \
+       $(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
        ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \
        ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql; \
        for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \