Fix for cross-compilation between mingw32 and something else. The choice

of pwd vs. pwd -W is correctly a function of the build system, not the
host system.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a1fc846ac86a802b9aaf065b71ec8d93c3abb840..749eae5a937e1b45e27155245e3b77e75aceefa7 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.249 2008/12/11 07:34:07 petere Exp $
+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.250 2009/01/05 09:54:12 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -322,6 +322,8 @@ WANTED_LANGUAGES = @WANTED_LANGUAGES@
 # Name of the "template"
 PORTNAME= @PORTNAME@
 
+build_os = @build_os@
+
 host_tuple = @host@
 host_os = @host_os@
 host_cpu = @host_cpu@

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 8ba244941a93918af44dd99b94cf947c516e062b..be017e5c9acef5c0a928d9ffbed48028234e8992 100644 (file)
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.75 2008/12/01 11:37:37 meskes Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.76 2009/01/05 09:54:13 petere Exp $
 
 subdir = src/interfaces/ecpg/test
 top_builddir = ../../../..
@@ -16,7 +16,7 @@ ifdef NO_LOCALE
 NOLOCALE += --no-locale
 endif
 
-ifneq ($(PORTNAME),win32)
+ifneq ($(build_os),mingw32)
 abs_builddir := $(shell pwd)
 else
 abs_builddir := $(shell pwd -W)