postgres.git / summary / log / commit / refs

commit    66b133d2b8a09fb468d59c174f9eae689bfc77a5
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Fri Dec 24 18:31:48 2010 +0000
First released in: 9.1.0, 8.4.7, 9.0.3

    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.


 src/bin/pgevent/Makefile          | 2 +-
 src/interfaces/ecpg/test/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile
index 013b801c64f..39cb7dcc5a7 100644
--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
@@ -27,7 +27,7 @@ pgevent.dll: pgevent.def $(OBJS)
 	$(DLLWRAP) --def $< -o $(NAME) $(OBJS)
 
 pgmsgevent.o: pgmsgevent.rc win32ver.rc
-	$(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir)
+	$(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.
 
 all-lib: $(NAME)
 
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)


[parent: c47458529533]