From 33fe338de2cf88998a418681c4138d0f4e3a6da9 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 29 Jun 2014 21:21:57 +0000 Subject: [PATCH] #2794 sfcgal regress sfcgal doesn't install if RUNTESTFLAGS is set by user because trying to reuse that flag. Define new flag SFCGALTESTFLAGS and pass that along. git-svn-id: http://svn.osgeo.org/postgis/trunk@12703 b70326c6-7e19-0410-871a-916f4a2858ee --- regress/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/Makefile.in b/regress/Makefile.in index a35a87761..c185331b3 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -181,7 +181,7 @@ ifeq ($(HAVE_SFCGAL),yes) sfcgal/concave_hull.sql \ sfcgal/wmsservers.sql - RUNTESTFLAGS = --sfcgal + SFCGALTESTFLAGS = --sfcgal endif @@ -207,8 +207,8 @@ staged-install: staged-install-raster staged-install-topology #$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install test check: staged-install - $(PERL) run_test.pl $(RUNTESTFLAGS) $(TESTS) && \ - $(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) $(TESTS) + $(PERL) run_test.pl $(RUNTESTFLAGS) ${SFCGALTESTFLAGS} $(TESTS) && \ + $(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) ${SFCGALTESTFLAGS} $(TESTS) garden: createdb postgis_garden -- 2.40.0