From 6e96d4db8ad13c8661ec032532c4c36ace81df95 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sat, 1 Feb 2014 15:16:18 -0500 Subject: [PATCH] Copy the libpq DLL to the bin directory on Mingw and Cygwin. This has long been done by the MSVC build system, and has caused confusion in the past when programs like psql have failed to start because they can't find the DLL. If it's in the same directory as it now will be they will find it. Backpatch to all live branches. --- src/interfaces/libpq/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index b71b0c76ef3..e1bd6c7436a 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -120,12 +120,18 @@ install: all installdirs install-lib $(INSTALL_DATA) $(srcdir)/libpq-int.h '$(DESTDIR)$(includedir_internal)' $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h '$(DESTDIR)$(includedir_internal)' $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample '$(DESTDIR)$(datadir)/pg_service.conf.sample' +ifneq (,$findstring($(PORTNAME), win32 cygwin)) + $(INSTALL_DATA) $(shlib) '$(DESTDIR)$(bindir)/$(shlib)' +endif installcheck: $(MAKE) -C test $@ installdirs: installdirs-lib $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' +ifneq (,$findstring($(PORTNAME), win32 cygwin)) + $(MKDIR_P) '$(DESTDIR)$(bindir)' +endif uninstall: uninstall-lib rm -f '$(DESTDIR)$(includedir)/libpq-fe.h' @@ -133,6 +139,9 @@ uninstall: uninstall-lib rm -f '$(DESTDIR)$(includedir_internal)/libpq-int.h' rm -f '$(DESTDIR)$(includedir_internal)/pqexpbuffer.h' rm -f '$(DESTDIR)$(datadir)/pg_service.conf.sample' +ifneq (,$findstring($(PORTNAME), win32 cygwin)) + rm -f '$(DESTDIR)$(bindir)/$(shlib)' +endif clean distclean: clean-lib $(MAKE) -C test $@ -- 2.39.5