Try an older bash syntax for robe?

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 3530354c1061cd85d085cbb02738e3dd1229ba33..decf19e927e1577edac16d84a5589e30a204b12e 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -22,7 +22,7 @@ PG_CONFIG    = pg_config
 
 PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
 SQL_BITS     = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN += sql/$(EXTENSION).sql ${SQL_BITS}
+EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
 
 
 ifeq ($(PG91),yes)
@@ -121,13 +121,17 @@ sql_bits/postgis--unpackaged.sql:   ../../postgis/postgis.sql
 
 sql_minor_upgrade: sql_bits/postgis_upgrade_minor.sql
        if test "$(PREREL_NUMBER)x" != "x"; then \
-                 for v in {$(PREREL_PREV)..1}; do \
+          v=$(PREREL_PREV); \
+          while [[ $$v -ge 1 ]]; do \
               cp -v $< sql/$(EXTENSION)--$(MINORVERSION).$(PREREL_PREFIX)$$v--$(EXTVERSION).sql; \
+              v=$$(($$v-1)); \
             done; \
        else \
          if test $(MICRO_NUMBER) -gt 0; then \
-           for v in {0..$(MICRO_PREV)}; do \
+          v=0; \
+          while [[ $$v -le $(MICRO_PREV) ]]; do \
              cp -v $< sql/$(EXTENSION)--$(MINORVERSION).$$v--$(EXTVERSION).sql; \
+              v=$$(($$v+1)); \
            done; \
          fi; \
         fi

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 3ee96fd79b7fe56dfc0f6d67c101dbc3a25ae39f..9257d195c78d9d9a51a06526960a97b6426f42fa 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -25,7 +25,7 @@ EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
 
 ifeq ($(PG91),yes)
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a12--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a13--$(EXTVERSION).sql
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        cp $< $@
@@ -69,13 +69,22 @@ sql/topology_upgrade_minor.sql:  sql_bits/topology.sql
                 -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \
                 $< > $@
 
-sql/$(EXTENSION)--2.0.0a11--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql  ../postgis_extension_helper_uninstall.sql
-       cat $^ > $@
-
-sql/$(EXTENSION)--2.0.0a12--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a11--$(EXTVERSION).sql
-       cp $< $@
-sql/$(EXTENSION)--2.0.0a13--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a11--$(EXTVERSION).sql
-       cp $< $@
+sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+       if test "$(PREREL_NUMBER)x" != "x"; then \
+          v=$(PREREL_PREV); \
+          while [[ $$v -ge 1 ]]; do \
+              cat $< > sql/$(EXTENSION)--$(MINORVERSION).$(PREREL_PREFIX)$$v--$(EXTVERSION).sql; \
+              v=$$(($$v-1)); \
+            done; \
+       else \
+         if test $(MICRO_NUMBER) -gt 0; then \
+          v=0; \
+          while [[ $$v -le $(MICRO_PREV) ]]; do \
+           cat $< > sql/$(EXTENSION)--$(MINORVERSION).$(PREREL_PREFIX)$$v--$(EXTVERSION).sql; \
+              v=$$(($$v+1)); \
+           done; \
+         fi; \
+        fi
        
 DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql