[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-120-g2fb40b3

git at osgeo.org git at osgeo.org
Fri Oct 30 09:38:32 PDT 2020


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  2fb40b3b01cf4b1c5c376eeab789ecb2efde154c (commit)
      from  b01b7e7630096f3bed3eaf310f6340a802d30019 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2fb40b3b01cf4b1c5c376eeab789ecb2efde154c
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Oct 30 17:37:47 2020 +0100

    Make staged-install rule parallel-safe

diff --git a/regress/Makefile.in b/regress/Makefile.in
index a585d7c..e98768b 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -66,26 +66,8 @@ distclean: clean
 	rm -f dumper/Makefile
 	rm -f sfcgal/Makefile
 
-staged-install-sfcgal:
-	@if test x"@SFCGAL@" != "x"; then \
-		$(MAKE) -C ../sfcgal REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
-	fi
-
-staged-install-topology:
-	@if test x"@TOPOLOGY@" != "x"; then \
-		$(MAKE) -C ../topology REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
-	fi
-
-staged-install-raster:
-	@if test x"@RASTER@" != "x"; then \
-		$(MAKE) -C ../raster/rt_pg REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
-	fi
-
-staged-install: staged-install-raster staged-install-topology staged-install-sfcgal
-	$(MAKE) -C ../postgis REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
-	$(MAKE) -C ../ REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) comments-install
-	$(PERL) -pi -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql
-	#$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
+staged-install:
+	$(MAKE) -C .. REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
 
 garden: staged-install
 	createdb postgis_garden

-----------------------------------------------------------------------

Summary of changes:
 regress/Makefile.in | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list