From e589b94396e08051eca5328a894a742f0fc1567b Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Wed, 7 Mar 2012 20:47:38 +0000
Subject: [PATCH] Fix need to hack regress source path

git-svn-id: http://svn.osgeo.org/postgis/trunk@9424 b70326c6-7e19-0410-871a-916f4a2858ee
---
 configure.ac        | 7 +++----
 regress/Makefile.in | 7 ++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f0e4f7cfa..8280e8877 100644
--- 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 f187b51e6..05dfee660 100644
--- 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
 
 # 
-- 
2.50.1