mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-24 18:55:04 +08:00
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.
This commit is contained in:
parent
c474585295
commit
66b133d2b8
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user