diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2010-12-24 13:32:20 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2010-12-24 13:32:20 -0500 |
| commit | 370a89969623647612a0d5727a143799d3b33b66 (patch) | |
| tree | 4d556e7716d1d2b98542979f792e2689a967486b | |
| parent | a5db8e12b3ba1b6a7180a34a8fffc325d09183f2 (diff) | |
| download | postgresql-370a89969623647612a0d5727a143799d3b33b66.tar.gz postgresql-370a89969623647612a0d5727a143799d3b33b66.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.
| -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 6b61b93bdc9..3690befd80c 100644 --- a/src/bin/pgevent/Makefile +++ b/src/bin/pgevent/Makefile @@ -25,7 +25,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 606348bb490..cc5090f58c1 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) |