Have 'installcheck' also check with upgrade-from-function

Closes #4485

Adds an installcheck-upgrade-byfunc target,
dependency of installcheck-upgrade

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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 65265b9e629a0fa60405dfc515e694e0217dcb92..a107124a21d8dfb533f3a07a72fd3db9f670c165 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -56,13 +56,21 @@ installcheck-base:
        RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
 
 # only run upgrade test if RUNTESTFLAGS was not already doing that
-installcheck-upgrade:
+installcheck-upgrade: installcheck-upgrade-byfunc
        if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
                RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
                        --upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)" \
                        $(MAKE) check; \
        fi
 
+# only run upgrade test if RUNTESTFLAGS was not already doing that
+installcheck-upgrade-byfunc:
+       if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
+               RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
+                       --upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)!" \
+                       $(MAKE) check; \
+       fi
+
 distclean: distclean-local
 
 distclean-local: clean-local