summaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2010-12-24 13:31:48 -0500
committerAndrew Dunstan <andrew@dunslane.net>2010-12-24 13:31:48 -0500
commit66b133d2b8a09fb468d59c174f9eae689bfc77a5 (patch)
tree088e78b75998601adda6e456d31886e8b00c5550 /src/interfaces
parentc47458529533bc88e34778818a4ce7d5c309d7a8 (diff)
Allow vpath builds and regression tests to succeed on Mingw. Backpatch to release 8.4 - earlier releases would require more changes and it's not worth the trouble.
Diffstat (limited to 'src/interfaces')
-rw-r--r--src/interfaces/ecpg/test/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 404b604a0f6..0e015bb5a6f 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -28,7 +28,7 @@ endif
ifneq ($(build_os),mingw32)
abs_builddir := $(shell pwd)
else
-abs_builddir := $(shell pwd -W)
+abs_builddir := $(shell sh -c "pwd -W")
endif
all install installdirs uninstall distprep:
@@ -73,7 +73,7 @@ $(top_builddir)/src/port/pg_config_paths.h: $(top_builddir)/src/Makefile.global
# $(srcdir) to the build directory.
ifdef VPATH
-remaining_files_src := $(wildcard $(srcdir)/*/*.pgc) $(wildcard $(srcdir)/expected/*.c) $(wildcard $(srcdir)/expected/*.stdout) $(wildcard $(srcdir)/expected/*.stderr)
+remaining_files_src := $(wildcard $(srcdir)/*/*.pgc) $(wildcard $(srcdir)/expected/*.c) $(wildcard $(srcdir)/expected/*.stdout) $(wildcard $(srcdir)/expected/*.stderr) $(srcdir)/resultmap
remaining_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(remaining_files_src))
all: $(remaining_files_build)