git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile

index 013b801c64f103601b46d6e15e7a94a80d22ce35..39cb7dcc5a7eb8f843d327c9bdaac27f35e0b540 100644 (file)

--- a/src/bin/pgevent/Makefile

+++ b/src/bin/pgevent/Makefile

$(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 404b604a0f6afccb6318da32b0afbb9c26d6cf1c..0e015bb5a6f82945981a3bba1d6e6f191212b559 100644 (file)

--- a/src/interfaces/ecpg/test/Makefile

+++ b/src/interfaces/ecpg/test/Makefile

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:

# $(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)