Put staged postgis.sql with other staged intsall objects

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index d0625da90f18d67d9aafd4f69777728a3e523e08..87b9e58bfc229f338d20db4cbc39173ae237d315 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -127,14 +127,17 @@ endif
 
 all install uninstall distclean:
 
-postgis.sql: ../postgis/postgis.sql
-       sed 's,$$libdir,$(REGRESS_INSTALLDIR)/lib,g' ../postgis/postgis.sql > postgis.sql
+postgis.sql: $(REGRESS_INSTALLDIR)/postgis.sql
 
-staged-install:
+$(REGRESS_INSTALLDIR)/postgis.sql: ../postgis/postgis.sql
+       mkdir -p $(REGRESS_INSTALLDIR)
+       sed 's,$$libdir,$(REGRESS_INSTALLDIR)/lib,g' ../postgis/postgis.sql > $@
+
+staged-install: postgis.sql
        $(MAKE) -C ../postgis REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
        #$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
 
-test check: postgis.sql staged-install
+test check: staged-install
        @USE_VERSION=$(POSTGIS_PGSQL_VERSION) ./run_test $(RUNTESTFLAGS) $(TESTS)
 
 garden:
@@ -155,4 +158,3 @@ cleanup:
 
 clean:
        rm -rf $(REGRESS_INSTALLDIR)
-       rm -f postgis.sql 

diff --git a/regress/run_test b/regress/run_test
index 304046e321d5bf02f5da5423c23960dbcb35bec8..27837d540525d27858148b24b35ccbbe9afffbe9 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -476,7 +476,7 @@ if test -z "$db_exists"; then
 
                createdb --template=template0 --lc-collate="C" "${DB}" > ${TMPDIR}/regress_log
                createlang plpgsql "${DB}" >> ${TMPDIR}/regress_log
-               ${PSQL} ${_psql_opts} -Xf ${REGDIR}/postgis.sql "${DB}" >> ${TMPDIR}/regress_log 2>&1 || init_db_error "core module initialization"
+               ${PSQL} ${_psql_opts} -Xf ${REGDIR}/00-regress-install/postgis.sql "${DB}" >> ${TMPDIR}/regress_log 2>&1 || init_db_error "core module initialization"
                if test x"$OPT_WITH_TOPO" = "xyes"; then
                        if test -e ${REGDIR}/../topology/topology.sql; then
                                echo "Adding topology support"