summaryrefslogtreecommitdiff
path: root/src/interfaces/ecpg/test/Makefile
diff options
context:
space:
mode:
authorAndrew Dunstan2010-12-24 18:31:28 +0000
committerAndrew Dunstan2010-12-24 18:31:28 +0000
commit04ee0db6b287a1ff41b55cc440769a1dddc318a7 (patch)
tree018ebcf4d2b5a2691cce391f0aa495a5a509dfea /src/interfaces/ecpg/test/Makefile
parent5000472112da91023bf468e57bb8ce9217426ed7 (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/ecpg/test/Makefile')
-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 e1ee40db65d..5718ae97b32 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)