Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit04ee0db

Browse files
committed
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.
1 parent5000472 commit04ee0db

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎src/bin/pgevent/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pgevent.dll: pgevent.def $(OBJS)
2727
$(DLLWRAP) --def$< -o$(NAME)$(OBJS)
2828

2929
pgmsgevent.o: pgmsgevent.rc win32ver.rc
30-
$(WINDRES)$< -o$@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir)
30+
$(WINDRES)$< -o$@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.
3131

3232
all-lib:$(NAME)
3333

‎src/interfaces/ecpg/test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endif
2828
ifneq ($(build_os),mingw32)
2929
abs_builddir :=$(shell pwd)
3030
else
31-
abs_builddir :=$(shell pwd -W)
31+
abs_builddir :=$(shellsh -c "pwd -W")
3232
endif
3333

3434
allinstallinstalldirsuninstalldistprep:
@@ -73,7 +73,7 @@ $(top_builddir)/src/port/pg_config_paths.h: $(top_builddir)/src/Makefile.global
7373
# $(srcdir) to the build directory.
7474

7575
ifdefVPATH
76-
remaining_files_src :=$(wildcard$(srcdir)/*/*.pgc)$(wildcard$(srcdir)/expected/*.c)$(wildcard$(srcdir)/expected/*.stdout)$(wildcard$(srcdir)/expected/*.stderr)
76+
remaining_files_src :=$(wildcard$(srcdir)/*/*.pgc)$(wildcard$(srcdir)/expected/*.c)$(wildcard$(srcdir)/expected/*.stdout)$(wildcard$(srcdir)/expected/*.stderr)$(srcdir)/resultmap
7777
remaining_files_build :=$(patsubst$(srcdir)/%,$(abs_builddir)/%,$(remaining_files_src))
7878

7979
all:$(remaining_files_build)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp