Fix need to hack regress source path

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

diff --git a/configure.ac b/configure.ac
index f0e4f7cfa45afe4201ab0ef1c319631d773b1c00..8280e88770e7cb08b9d3282fefeb18d0345ce547 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -103,14 +103,13 @@ dnl for in-place regression tests
 dnl 
 case $host_os in
          *mingw*)
-                 PWDREGRESS="bash -c 'pwd -W'"
+                 MINGWBUILD=1
                  ;;
          *)
-                 PWDREGRESS="pwd"
+                 MINGWBUILD=0
                  ;;
 esac
-AC_DEFINE_UNQUOTED([PWDREGRESS], [PWDREGRESS], [Define command to determine the current directory during regression])
-AC_SUBST([PWDREGRESS])
+AC_SUBST([MINGWBUILD])
 
 AC_PATH_PROG([PERL], [perl], [])
 if test "x$PERL" = "x"; then

diff --git a/regress/Makefile.in b/regress/Makefile.in
index f187b51e6ed7754b030d90d63b8492536c129c76..05dfee6602cbe80501e9be67a4a2eb37547e1509 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -19,6 +19,7 @@ POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
 POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@
 POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@
 HAVE_JSON=@HAVE_JSON@
+MINGWBUILD=@MINGWBUILD@
 
 # MingW hack: rather than use PGSQL_BINDIR directly, we change
 # to the directory and then use "pwd" to return the path. This
@@ -27,7 +28,11 @@ HAVE_JSON=@HAVE_JSON@
 PGSQL_BINDIR=$(shell cd "@PGSQL_BINDIR@" && pwd)
 
 # Where we put our regression installation 
-srcdir=$(shell @PWDREGRESS@)
+ifeq ($(MINGWBUILD),1)
+        srcdir=$(shell bash -c "pwd -W")
+else
+        srcdir=$(shell pwd)
+endif
 REGRESS_INSTALLDIR=$(srcdir)/00-regress-install
 
 #