diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2010-12-24 13:31:28 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2010-12-24 13:31:28 -0500 |
| commit | 04ee0db6b287a1ff41b55cc440769a1dddc318a7 (patch) | |
| tree | 018ebcf4d2b5a2691cce391f0aa495a5a509dfea /src | |
| parent | 5000472112da91023bf468e57bb8ce9217426ed7 (diff) | |
| download | postgresql-04ee0db6b287a1ff41b55cc440769a1dddc318a7.tar.gz postgresql-04ee0db6b287a1ff41b55cc440769a1dddc318a7.zip | |
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')
| -rw-r--r-- | src/bin/pgevent/Makefile | 2 | ||||
| -rw-r--r-- | 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 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) |